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

[sfrench/cifs-2.6.git] / arch / x86 / boot / compressed / head_64.S

diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 077e1b69198e75d2a14fe7cfe0ff8a421f8686a3..faff0dc9c06a2389a405cdcb3e089baf8c7ad285 100644 (file)
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -107,8 +107,7 @@ ENTRY(startup_32)
        lgdt    gdt(%ebp)
 
        /* Enable PAE mode */
-       xorl    %eax, %eax
-       orl     $(X86_CR4_PAE), %eax
+       movl    $(X86_CR4_PAE), %eax
        movl    %eax, %cr4
 
  /*