summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-11-04 17:50:12 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-12-14 09:50:58 -0800
commitdcab9753b799bd92a5701106f1861b825c7eef74 (patch)
treec02bbb64ed8b34f349bcb4b40c29449781049347 /arch
parent0fe8f9b280a5f7a65aebc51ab6b5200a8bf05e13 (diff)
x86 setup: add a near jump to serialize %cr0 on 386/486
patch 7ed192906a2144ebc8ca2925a85d27b9c5355668 in mainline. The 386 and 486 needs a jump immediately after setting %cr0 in order to serialize the pipeline. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/boot/pmjump.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/boot/pmjump.S b/arch/i386/boot/pmjump.S
index 2e559233725a..26baeab3a4d4 100644
--- a/arch/i386/boot/pmjump.S
+++ b/arch/i386/boot/pmjump.S
@@ -31,14 +31,14 @@ protected_mode_jump:
xorl %ebx, %ebx # Flag to indicate this is a boot
movl %edx, %esi # Pointer to boot_params table
movl %eax, 2f # Patch ljmpl instruction
- jmp 1f # Short jump to flush instruction q.
-1:
movw $__BOOT_DS, %cx
movl %cr0, %edx
orb $1, %dl # Protected mode (PE) bit
movl %edx, %cr0
+ jmp 1f # Short jump to serialize on 386/486
+1:
movw %cx, %ds
movw %cx, %es