summaryrefslogtreecommitdiffstats
path: root/arch/x86
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/x86
parentc19f9a84ec807da57fd75bbd9a3f2b8269611f79 (diff)
downloadop-kernel-dev-c41b93fb8551148a93d3bba870365e8489317f02.zip
op-kernel-dev-c41b93fb8551148a93d3bba870365e8489317f02.tar.gz
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/x86')
-rw-r--r--arch/x86/include/asm/acpi.h3
-rw-r--r--arch/x86/kernel/acpi/sleep.c8
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 211ca3f..47981f0 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -112,9 +112,8 @@ static inline void acpi_disable_pci(void)
acpi_noirq_set();
}
-/* 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/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 68d1537..c27a483 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -110,14 +110,6 @@ int acpi_save_state_mem(void)
return 0;
}
-/*
- * acpi_restore_state - undo effects of acpi_save_state_mem
- */
-void acpi_restore_state_mem(void)
-{
-}
-
-
/**
* acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
*
OpenPOWER on IntegriCloud