diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 11:02:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 11:02:42 -0400 |
| commit | 1e72fe1fca4490474984d6356bbf66e2daa89f73 (patch) | |
| tree | 12d95820cbb2083a6c78cfe550a0f9b20b1246eb /arch/x86/kernel/acpi/wakeup_32.S | |
| parent | 8a211d362cc94df2bb42323ab13d258650529bec (diff) | |
| parent | a46d2619d7180bda12bad2bf15bbd0731dfc2dcf (diff) | |
Merge branch 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
* 'imx/fixes-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: dts: imx51-babbage: fix esdhc cd/wp properties
ARM: imx6: spin the cpu until hardware takes it down
ARM i.MX6q: Add virtual 1/3.5 dividers in the LDB clock path
Also updates to Linux 3.6-rc2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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: | |||
| 74 | ENTRY(do_suspend_lowlevel) | 74 | ENTRY(do_suspend_lowlevel) |
| 75 | call save_processor_state | 75 | call save_processor_state |
| 76 | call save_registers | 76 | call save_registers |
| 77 | call acpi_enter_s3 | 77 | pushl $3 |
| 78 | call acpi_enter_sleep_state | ||
| 79 | addl $4, %esp | ||
| 78 | 80 | ||
| 79 | # In case of S3 failure, we'll emerge here. Jump | 81 | # In case of S3 failure, we'll emerge here. Jump |
| 80 | # to ret_point to recover | 82 | # to ret_point to recover |