projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull trivial into test branch
[powerpc.git]
/
arch
/
i386
/
kernel
/
acpi
/
wakeup.S
diff --git
a/arch/i386/kernel/acpi/wakeup.S
b/arch/i386/kernel/acpi/wakeup.S
index
9f408ee
..
b781b38
100644
(file)
--- a/
arch/i386/kernel/acpi/wakeup.S
+++ b/
arch/i386/kernel/acpi/wakeup.S
@@
-292,7
+292,10
@@
ENTRY(do_suspend_lowlevel)
pushl $3
call acpi_enter_sleep_state
addl $4, %esp
- ret
+
+# In case of S3 failure, we'll emerge here. Jump
+# to ret_point to recover
+ jmp ret_point
.p2align 4,,7
ret_point:
call restore_registers