aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-07-29 00:15:37 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-29 00:46:00 -0400
commit17158d17aa726142255050b407ad701a6f191aba (patch)
tree40256c4adc9eee2f504ab2ef7eea316f5a10fbe0 /include/asm-x86_64
parentca4e6b740206fc943cc1c90fd434d4d389da8f2b (diff)
[PATCH] x86_64: Fix incorrectly defined MSR_K8_SYSCFG
Harmless because the kernel didn't use it. Noticed by Travis Betak Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-x86_64')
-rw-r--r--include/asm-x86_64/msr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h
index bc700232728d..ba15279a79d0 100644
--- a/include/asm-x86_64/msr.h
+++ b/include/asm-x86_64/msr.h
@@ -218,7 +218,7 @@ extern inline unsigned int cpuid_edx(unsigned int op)
218#define MSR_K7_PERFCTR3 0xC0010007 218#define MSR_K7_PERFCTR3 0xC0010007
219#define MSR_K8_TOP_MEM1 0xC001001A 219#define MSR_K8_TOP_MEM1 0xC001001A
220#define MSR_K8_TOP_MEM2 0xC001001D 220#define MSR_K8_TOP_MEM2 0xC001001D
221#define MSR_K8_SYSCFG 0xC0000010 221#define MSR_K8_SYSCFG 0xC0010010
222 222
223/* K6 MSRs */ 223/* K6 MSRs */
224#define MSR_K6_EFER 0xC0000080 224#define MSR_K6_EFER 0xC0000080