summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNickolai Zeldovich <kolya@MIT.EDU>2005-04-08 23:37:34 -0400
committerLen Brown <len.brown@intel.com>2005-07-12 00:04:31 -0400
commit9d9437759eb6fdb68f7b82cbee20b0fb711d9f0d (patch)
treed628c8be86e066f11c5967c5ee02c7248993607d
parentc9c3e457de24cca2ca688fa397d93a241f472048 (diff)
[ACPI] S3 resume -- use lgdtl, not lgdt
From: Nickolai Zeldovich <kolya@MIT.EDU> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--arch/i386/kernel/acpi/wakeup.S5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index 39d32484f6f5..44d886c745ec 100644
--- 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)
- # 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