diff options
| author | Brian Gerst <brgerst@gmail.com> | 2010-07-17 09:03:27 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-07-21 21:23:40 -0700 |
| commit | cfaa71ee9794472598d3966c3315cd6bd8f953d3 (patch) | |
| tree | 77991fa2648ffcb8bdcb7d76b9e896393402143d /arch/x86/kernel | |
| parent | 8c06585d6431addadd94903843dfbcd315b42d4e (diff) | |
| download | op-kernel-dev-cfaa71ee9794472598d3966c3315cd6bd8f953d3.zip op-kernel-dev-cfaa71ee9794472598d3966c3315cd6bd8f953d3.tar.gz | |
x86: Use symbolic MSR names
Use symbolic MSR names instead of hardcoding the MSR index.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
LKML-Reference: <1279371808-24804-2-git-send-email-brgerst@gmail.com>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/acpi/realmode/wakeup.S | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/verify_cpu_64.S | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S index 580b4e2..28595d6 100644 --- a/arch/x86/kernel/acpi/realmode/wakeup.S +++ b/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/arch/x86/kernel/verify_cpu_64.S b/arch/x86/kernel/verify_cpu_64.S index 45b6f8a..56a8c2a 100644 --- a/arch/x86/kernel/verify_cpu_64.S +++ b/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 |
