From 338dfd340ba1f402bd87ed6ddebc01baf0adbb7b Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Wed, 30 Jan 2008 13:33:02 +0100 Subject: [PATCH] --- yaml --- r: 80242 b: refs/heads/master c: 02a7b425e82cd0052e5eaedbae81a522c6aae6c4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/boot/pmjump.S | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 44ce74a9be8e..894c8502e9f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88089519f302f1296b4739be45699f06f728ec31 +refs/heads/master: 02a7b425e82cd0052e5eaedbae81a522c6aae6c4 diff --git a/trunk/arch/x86/boot/pmjump.S b/trunk/arch/x86/boot/pmjump.S index f7153d0d476e..f5402d51f7c3 100644 --- a/trunk/arch/x86/boot/pmjump.S +++ b/trunk/arch/x86/boot/pmjump.S @@ -15,6 +15,7 @@ */ #include +#include #include .text @@ -39,7 +40,7 @@ protected_mode_jump: movw $__BOOT_TSS, %di movl %cr0, %edx - orb $1, %dl # Protected mode (PE) bit + orb $X86_CR0_PE, %dl # Protected mode movl %edx, %cr0 jmp 1f # Short jump to serialize on 386/486 1: