diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-13 06:48:21 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-13 06:48:21 +0900 |
| commit | 2870f5352451a99a364a807803e4c39477264c3c (patch) | |
| tree | 11ee9795559bdc9645a0a17815611c624066c515 /arch/x86/kernel/acpi/wakeup_32.S | |
| parent | 06c77b3ce1b81163d74d9d5e904de731934e8510 (diff) | |
| parent | 5fdbdd1d4b9ec58e51092e24c231a303b38cdb94 (diff) | |
| download | talos-obmc-linux-2870f5352451a99a364a807803e4c39477264c3c.tar.gz talos-obmc-linux-2870f5352451a99a364a807803e4c39477264c3c.zip | |
Merge branch 'next/cleanup-samsung-macro' into next/cleanup-samsung
Diffstat (limited to 'arch/x86/kernel/acpi/wakeup_32.S')
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index 13ab720573e3..72610839f03b 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S @@ -74,9 +74,7 @@ restore_registers: ENTRY(do_suspend_lowlevel) call save_processor_state call save_registers - pushl $3 - call acpi_enter_sleep_state - addl $4, %esp + call acpi_enter_s3 # In case of S3 failure, we'll emerge here. Jump # to ret_point to recover |
