# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/04/08 23:37:34-04:00 len.brown@intel.com # [ACPI] S3 resume -- use lgdtl, not lgdt # # From: Nickolai Zeldovich # Signed-off-by: Len Brown # # arch/i386/kernel/acpi/wakeup.S # 2005/04/08 23:37:13-04:00 len.brown@intel.com +3 -2 # use lgdtl # diff -Nru a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S --- a/arch/i386/kernel/acpi/wakeup.S 2005-07-09 17:45:27 -04:00 +++ b/arch/i386/kernel/acpi/wakeup.S 2005-07-09 17:45:27 -04:00 @@ -74,8 +74,9 @@ 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