diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-31 15:45:48 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-31 15:45:48 +1000 |
| commit | aa43f77939c97bf9d3580c6a5e71a5a40290e451 (patch) | |
| tree | 095c0b8b3da4b6554a3f8ef4b39240a5d9216d4d /arch/i386/kernel/acpi/wakeup.S | |
| parent | 2818c5dec5e28d65d52afbb7695bbbafe6377ee5 (diff) | |
| parent | 4c15343167b5febe7bb0ba96aad5bef42ae94d3b (diff) | |
| download | talos-op-linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.tar.gz talos-op-linux-aa43f77939c97bf9d3580c6a5e71a5a40290e451.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/i386/kernel/acpi/wakeup.S')
| -rw-r--r-- | arch/i386/kernel/acpi/wakeup.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S index 9f408eee4e6f..b781b38131c0 100644 --- 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 |
