summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-08 23:41:35 +0100
committerRafael J. Wysocki <rjw@sisk.pl>2011-02-24 19:58:54 +0100
commitc41b93fb8551148a93d3bba870365e8489317f02 (patch)
tree73445afcf210487e9017e708a6850fa765e98d93 /arch/ia64
parentc19f9a84ec807da57fd75bbd9a3f2b8269611f79 (diff)
downloadblackbird-op-linux-c41b93fb8551148a93d3bba870365e8489317f02.tar.gz
blackbird-op-linux-c41b93fb8551148a93d3bba870365e8489317f02.zip
ACPI / PM: Drop acpi_restore_state_mem()
The function acpi_restore_state_mem() has never been and most likely never will be used, so remove it. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/acpi.h4
-rw-r--r--arch/ia64/kernel/acpi.c5
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h
index 837dc82a013e..db3986a71af8 100644
--- a/arch/ia64/include/asm/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -128,9 +128,9 @@ 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);
-/* routines for saving/restoring kernel state */
+/* Routine for saving kernel state during suspend. */
extern int acpi_save_state_mem(void);
-extern void acpi_restore_state_mem(void);
+
extern unsigned long acpi_wakeup_address;
/*
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 90ebceb899a0..7cf2d10c0677 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -1041,11 +1041,6 @@ EXPORT_SYMBOL(acpi_unregister_ioapic);
int acpi_save_state_mem(void) { return 0; }
/*
- * acpi_restore_state()
- */
-void acpi_restore_state_mem(void) {}
-
-/*
* do_suspend_lowlevel()
*/
void do_suspend_lowlevel(void) {}
OpenPOWER on IntegriCloud