aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2011-02-08 17:41:35 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2011-02-24 13:58:54 -0500
commitc41b93fb8551148a93d3bba870365e8489317f02 (patch)
tree73445afcf210487e9017e708a6850fa765e98d93 /arch/x86
parentc19f9a84ec807da57fd75bbd9a3f2b8269611f79 (diff)
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 211ca3f7fd16..47981f0d121b 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)
112 acpi_noirq_set(); 112 acpi_noirq_set();
113} 113}
114 114
115/* routines for saving/restoring kernel state */ 115/* Routine for saving kernel state during suspend. */
116extern int acpi_save_state_mem(void); 116extern int acpi_save_state_mem(void);
117extern void acpi_restore_state_mem(void);
118 117
119extern unsigned long acpi_wakeup_address; 118extern unsigned long acpi_wakeup_address;
120 119
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 68d1537b8c81..c27a483094b1 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)
110 return 0; 110 return 0;
111} 111}
112 112
113/*
114 * acpi_restore_state - undo effects of acpi_save_state_mem
115 */
116void acpi_restore_state_mem(void)
117{
118}
119
120
121/** 113/**
122 * acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation 114 * acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
123 * 115 *