From 66ed437511fa66dfb7bfa3466de4dcb39566bcae Mon Sep 17 00:00:00 2001
From: Brian Gerst <brgerst@gmail.com>
Date: Sat, 17 Jul 2010 09:03:27 -0400
Subject: [PATCH] --- yaml --- r: 205478 b: refs/heads/master c:
 cfaa71ee9794472598d3966c3315cd6bd8f953d3 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/x86/kernel/acpi/realmode/wakeup.S | 2 +-
 trunk/arch/x86/kernel/verify_cpu_64.S        | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b08e9ad1b9cf..b7785fe6e508 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c06585d6431addadd94903843dfbcd315b42d4e
+refs/heads/master: cfaa71ee9794472598d3966c3315cd6bd8f953d3
diff --git a/trunk/arch/x86/kernel/acpi/realmode/wakeup.S b/trunk/arch/x86/kernel/acpi/realmode/wakeup.S
index 580b4e296010..28595d6df47c 100644
--- a/trunk/arch/x86/kernel/acpi/realmode/wakeup.S
+++ b/trunk/arch/x86/kernel/acpi/realmode/wakeup.S
@@ -104,7 +104,7 @@ _start:
 	movl	%eax, %ecx
 	orl	%edx, %ecx
 	jz	1f
-	movl	$0xc0000080, %ecx
+	movl	$MSR_EFER, %ecx
 	wrmsr
 1:
 
diff --git a/trunk/arch/x86/kernel/verify_cpu_64.S b/trunk/arch/x86/kernel/verify_cpu_64.S
index 45b6f8a975a1..56a8c2a867d9 100644
--- a/trunk/arch/x86/kernel/verify_cpu_64.S
+++ b/trunk/arch/x86/kernel/verify_cpu_64.S
@@ -31,6 +31,7 @@
  */
 
 #include <asm/cpufeature.h>
+#include <asm/msr-index.h>
 
 verify_cpu:
 	pushfl				# Save caller passed flags
@@ -88,7 +89,7 @@ verify_cpu_sse_test:
 	je	verify_cpu_sse_ok
 	test	%di,%di
 	jz	verify_cpu_no_longmode	# only try to force SSE on AMD
-	movl	$0xc0010015,%ecx	# HWCR
+	movl	$MSR_K7_HWCR,%ecx
 	rdmsr
 	btr	$15,%eax		# enable SSE
 	wrmsr