Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux...

[linux-2.6-omap-h63xx.git] / arch / x86 / boot / pmjump.S

diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S
index f7153d0d476e8beb8d38c1a8bfe3d0088968a5b0..ab049d40a884d7ef44d32fb63e30c44ed6aedabf 100644 (file)
--- a/arch/x86/boot/pmjump.S
+++ b/arch/x86/boot/pmjump.S
@@ -9,12 +9,11 @@
  * ----------------------------------------------------------------------- */
 
 /*
- * arch/i386/boot/pmjump.S
- *
  * The actual transition into protected mode
  */
 
 #include <asm/boot.h>
+#include <asm/processor-flags.h>
 #include <asm/segment.h>
 
        .text
@@ -39,7 +38,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: