diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-08 23:42:22 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-24 19:58:54 +0100 |
| commit | f1a2003e22f6b50ea21f7f4b38b38c5ebc9c8017 (patch) | |
| tree | 5317a7133739f2f352d2cde56213caeab5cf12ac /arch/ia64/include/asm/acpi.h | |
| parent | 979f11b060c0b35b03b86ae854d6f21a710305d0 (diff) | |
| download | linux-f1a2003e22f6b50ea21f7f4b38b38c5ebc9c8017.tar.bz2 | |
ACPI / PM: Merge do_suspend_lowlevel() into acpi_save_state_mem()
The function do_suspend_lowlevel() is specific to x86 and defined in
assembly code, so it should be called from the x86 low-level suspend
code rather than from acpi_suspend_enter().
Merge do_suspend_lowlevel() into the x86's acpi_save_state_mem() and
change the name of the latter to acpi_suspend_lowlevel(), so that the
function's purpose is better reflected by its name.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/ia64/include/asm/acpi.h')
| -rw-r--r-- | arch/ia64/include/asm/acpi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index db3986a71af8..a06dfb13d518 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h @@ -128,8 +128,8 @@ static inline const char *acpi_get_sysname (void) int acpi_request_vector (u32 int_type); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); -/* Routine for saving kernel state during suspend. */ -extern int acpi_save_state_mem(void); +/* Low-level suspend routine. */ +extern int acpi_suspend_lowlevel(void); extern unsigned long acpi_wakeup_address; |