diff options
| author | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-07-12 17:21:56 -0400 |
| commit | 5028770a42e7bc4d15791a44c28f0ad539323807 (patch) | |
| tree | 74800e35129775413c13ce7caf036ca19e3ce56c /arch/i386/kernel/acpi/wakeup.S | |
| parent | 9f02d6b7b43d46a74dd385f06090104ecd0fb807 (diff) | |
| parent | d8683a0cb5d09cb7f19feefa708424a84577e68f (diff) | |
[ACPI] merge acpi-2.6.12 branch into latest Linux 2.6.13-rc...
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel/acpi/wakeup.S')
| -rw-r--r-- | arch/i386/kernel/acpi/wakeup.S | 5 |
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: | |||
| 74 | movw %ax,%fs | 74 | movw %ax,%fs |
| 75 | movw $0x0e00 + 'i', %fs:(0x12) | 75 | movw $0x0e00 + 'i', %fs:(0x12) |
| 76 | 76 | ||
| 77 | # need a gdt | 77 | # need a gdt -- use lgdtl to force 32-bit operands, in case |
| 78 | lgdt real_save_gdt - wakeup_code | 78 | # the GDT is located past 16 megabytes. |
| 79 | lgdtl real_save_gdt - wakeup_code | ||
| 79 | 80 | ||
| 80 | movl real_save_cr0 - wakeup_code, %eax | 81 | movl real_save_cr0 - wakeup_code, %eax |
| 81 | movl %eax, %cr0 | 82 | movl %eax, %cr0 |