From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Tue, 13 May 2008 17:14:22 +0000 (+0400)
Subject: x86: head_64.S cleanup - use straight move to CR4 register
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=05139d8fb445d9a3569071af1c5920fc46191b7b;p=linux-beck.git

x86: head_64.S cleanup - use straight move to CR4 register

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 2f59ca8bd16c..7475b4c91f05 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -155,9 +155,7 @@ ENTRY(secondary_startup_64)
 	 */
 
 	/* Enable PAE mode and PGE */
-	xorq	%rax, %rax
-	btsq	$5, %rax
-	btsq	$7, %rax
+	movl	$(X86_CR4_PAE | X86_CR4_PGE), %eax
 	movq	%rax, %cr4
 
 	/* Setup early boot stage 4 level pagetables. */