diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:43:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 09:43:01 +0200 |
| commit | 3c1ca43fafea41e38cb2d0c1684119af4c1de547 (patch) | |
| tree | 122e41a7b9fca26ea25ea9864180f5016274a8c8 /arch/x86/boot/pmjump.S | |
| parent | 6924d1ab8b7bbe5ab416713f5701b3316b2df85b (diff) | |
| parent | 6bcb13b35a2ea39be6c7cc0292b8ad1191b1a748 (diff) | |
Merge branch 'x86/setup' into x86/devel
Diffstat (limited to 'arch/x86/boot/pmjump.S')
| -rw-r--r-- | arch/x86/boot/pmjump.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S index ab049d40a88..141b6e20ed3 100644 --- a/arch/x86/boot/pmjump.S +++ b/arch/x86/boot/pmjump.S @@ -33,6 +33,8 @@ protected_mode_jump: movw %cs, %bx shll $4, %ebx addl %ebx, 2f + jmp 1f # Short jump to serialize on 386/486 +1: movw $__BOOT_DS, %cx movw $__BOOT_TSS, %di @@ -40,8 +42,6 @@ protected_mode_jump: movl %cr0, %edx orb $X86_CR0_PE, %dl # Protected mode movl %edx, %cr0 - jmp 1f # Short jump to serialize on 386/486 -1: # Transition to 32-bit mode .byte 0x66, 0xea # ljmpl opcode |