aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/mtrr/generic.c
diff options
context:
space:
mode:
authorJaswinder Singh Rajput <jaswinderrajput@gmail.com>2009-05-14 02:36:12 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-05-15 10:49:00 -0400
commitd9bcc01d58d18ed287091707b0b45c6ac888a11a (patch)
treee845b49eeaa85c19427dac03e9603f108e62d7d7 /arch/x86/kernel/cpu/mtrr/generic.c
parent778dedae0cb76a441145f3a0c5d59fcb3ba296d5 (diff)
x86, mtrr: replace MTRRcap_MSR with msr-index's MSR_MTRRcap
Use standard msr-index.h's MSR declaration and no need to declare again. [ Impact: cleanup, no object code change ] Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/cpu/mtrr/generic.c')
-rw-r--r--arch/x86/kernel/cpu/mtrr/generic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 0b776c09aff3..de9c20ffa0db 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -306,7 +306,7 @@ void __init get_mtrr_state(void)
306 306
307 vrs = mtrr_state.var_ranges; 307 vrs = mtrr_state.var_ranges;
308 308
309 rdmsr(MTRRcap_MSR, lo, dummy); 309 rdmsr(MSR_MTRRcap, lo, dummy);
310 mtrr_state.have_fixed = (lo >> 8) & 1; 310 mtrr_state.have_fixed = (lo >> 8) & 1;
311 311
312 for (i = 0; i < num_var_ranges; i++) 312 for (i = 0; i < num_var_ranges; i++)
@@ -703,7 +703,7 @@ int generic_validate_add_page(unsigned long base, unsigned long size, unsigned i
703static int generic_have_wrcomb(void) 703static int generic_have_wrcomb(void)
704{ 704{
705 unsigned long config, dummy; 705 unsigned long config, dummy;
706 rdmsr(MTRRcap_MSR, config, dummy); 706 rdmsr(MSR_MTRRcap, config, dummy);
707 return (config & (1 << 10)); 707 return (config & (1 << 10));
708} 708}
709 709