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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
39d3248
..
7c74fe0
100644
(file)
--- a/
arch/i386/kernel/acpi/wakeup.S
+++ b/
arch/i386/kernel/acpi/wakeup.S
@@
-74,8
+74,9
@@
wakeup_code:
movw %ax,%fs
movw $0x0e00 + 'i', %fs:(0x12)
movw %ax,%fs
movw $0x0e00 + 'i', %fs:(0x12)
- # need a gdt
- lgdt real_save_gdt - wakeup_code
+ # need a gdt -- use lgdtl to force 32-bit operands, in case
+ # the GDT is located past 16 megabytes.
+ lgdtl real_save_gdt - wakeup_code
movl real_save_cr0 - wakeup_code, %eax
movl %eax, %cr0
movl real_save_cr0 - wakeup_code, %eax
movl %eax, %cr0
@@
-303,12
+304,6
@@
ret_point:
call restore_processor_state
ret
call restore_processor_state
ret
-ENTRY(do_suspend_lowlevel_s4bios)
- call save_processor_state
- call save_registers
- call acpi_enter_sleep_state_s4bios
- ret
-
ALIGN
# saved registers
saved_gdt: .long 0,0
ALIGN
# saved registers
saved_gdt: .long 0,0