diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:39:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:39:59 -0400 |
| commit | 0679c2f47d50651018dd5e0bf35330f6e6ae35ec (patch) | |
| tree | 2df65ebb958f930abf0b7ad35fd6e528398b1679 /arch/x86/boot/pmjump.S | |
| parent | 76fbc263ff7e42ce8b21b8aee176e3c74b45f81a (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into pci-for-jesse
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 ab049d40a884..141b6e20ed31 100644 --- a/arch/x86/boot/pmjump.S +++ b/arch/x86/boot/pmjump.S | |||
| @@ -33,6 +33,8 @@ protected_mode_jump: | |||
| 33 | movw %cs, %bx | 33 | movw %cs, %bx |
| 34 | shll $4, %ebx | 34 | shll $4, %ebx |
| 35 | addl %ebx, 2f | 35 | addl %ebx, 2f |
| 36 | jmp 1f # Short jump to serialize on 386/486 | ||
| 37 | 1: | ||
| 36 | 38 | ||
| 37 | movw $__BOOT_DS, %cx | 39 | movw $__BOOT_DS, %cx |
| 38 | movw $__BOOT_TSS, %di | 40 | movw $__BOOT_TSS, %di |
| @@ -40,8 +42,6 @@ protected_mode_jump: | |||
| 40 | movl %cr0, %edx | 42 | movl %cr0, %edx |
| 41 | orb $X86_CR0_PE, %dl # Protected mode | 43 | orb $X86_CR0_PE, %dl # Protected mode |
| 42 | movl %edx, %cr0 | 44 | movl %edx, %cr0 |
| 43 | jmp 1f # Short jump to serialize on 386/486 | ||
| 44 | 1: | ||
| 45 | 45 | ||
| 46 | # Transition to 32-bit mode | 46 | # Transition to 32-bit mode |
| 47 | .byte 0x66, 0xea # ljmpl opcode | 47 | .byte 0x66, 0xea # ljmpl opcode |