diff options
| author | Len Brown | 2012-07-27 01:40:08 +0200 |
|---|---|---|
| committer | Len Brown | 2012-07-31 03:10:16 +0200 |
| commit | 3b6961ba8c682cc71e51079017743c1b282fd259 (patch) | |
| tree | 5c8cafe80b6cc8f6358046a402f815624df324dc /arch/x86/kernel/acpi/sleep.c | |
| parent | Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuid... (diff) | |
| download | kernel-qcow2-linux-3b6961ba8c682cc71e51079017743c1b282fd259.tar.gz kernel-qcow2-linux-3b6961ba8c682cc71e51079017743c1b282fd259.tar.xz kernel-qcow2-linux-3b6961ba8c682cc71e51079017743c1b282fd259.zip | |
ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler'
cd74257b974d6d26442c97891c4d05772748b177
patched up GTS/BFS -- a feature we want to remove.
So revert it (by hand, due to conflict in sleep.h)
to prepare for GTS/BFS removal.
Signed-off-by: Len Brown <len.brown@intel.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
| -rw-r--r-- | arch/x86/kernel/acpi/sleep.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c index 95bf99de9058..1b8e5a03d942 100644 --- a/arch/x86/kernel/acpi/sleep.c +++ b/arch/x86/kernel/acpi/sleep.c @@ -25,10 +25,6 @@ unsigned long acpi_realmode_flags; static char temp_stack[4096]; #endif -asmlinkage void acpi_enter_s3(void) -{ - acpi_enter_sleep_state(3, wake_sleep_flags); -} /** * acpi_suspend_lowlevel - save kernel state * |