diff options
| author | Len Brown <len.brown@intel.com> | 2012-07-26 19:40:08 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2012-07-30 21:10:16 -0400 |
| commit | 3b6961ba8c682cc71e51079017743c1b282fd259 (patch) | |
| tree | 5c8cafe80b6cc8f6358046a402f815624df324dc /arch/x86/kernel/acpi/wakeup_32.S | |
| parent | ec033d0a02901551346b9f43f8ff9bad51378891 (diff) | |
| download | linux-3b6961ba8c682cc71e51079017743c1b282fd259.tar.bz2 | |
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/wakeup_32.S')
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index 72610839f03b..13ab720573e3 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S @@ -74,7 +74,9 @@ restore_registers: ENTRY(do_suspend_lowlevel) call save_processor_state call save_registers - call acpi_enter_s3 + pushl $3 + call acpi_enter_sleep_state + addl $4, %esp # In case of S3 failure, we'll emerge here. Jump # to ret_point to recover |