git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.6-1.422
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
acpi
/
wakeup.S
diff --git
a/arch/i386/kernel/acpi/wakeup.S
b/arch/i386/kernel/acpi/wakeup.S
index
3c9ca26
..
c43349a
100644
(file)
--- a/
arch/i386/kernel/acpi/wakeup.S
+++ b/
arch/i386/kernel/acpi/wakeup.S
@@
-285,6
+285,7
@@
ENTRY(do_suspend_lowlevel)
call save_registers
pushl $3
call acpi_enter_sleep_state
+ addl $4,%esp
ret
.p2align 4,,7
ret_point: