UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Jaswinder Singh Rajput 2009-05-14 12:06:12 +05:30 committed by H. Peter Anvin
parent 778dedae0c
commit d9bcc01d58
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/cpu/mtrr/generic.c
View File

@ -306,7 +306,7 @@ void __init get_mtrr_state(void)
vrs = mtrr_state.var_ranges; vrs = mtrr_state.var_ranges;
rdmsr(MTRRcap_MSR, lo, dummy); rdmsr(MSR_MTRRcap, lo, dummy);
mtrr_state.have_fixed = (lo >> 8) & 1; mtrr_state.have_fixed = (lo >> 8) & 1;
for (i = 0; i < num_var_ranges; i++) 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
static int generic_have_wrcomb(void) static int generic_have_wrcomb(void)
{ {
unsigned long config, dummy; unsigned long config, dummy;
rdmsr(MTRRcap_MSR, config, dummy); rdmsr(MSR_MTRRcap, config, dummy);
return (config & (1 << 10)); return (config & (1 << 10));
} }

2
arch/x86/kernel/cpu/mtrr/main.c
View File

@ -104,7 +104,7 @@ static void __init set_num_var_ranges(void)
unsigned long config = 0, dummy; unsigned long config = 0, dummy;
if (use_intel()) { if (use_intel()) {
rdmsr(MTRRcap_MSR, config, dummy); rdmsr(MSR_MTRRcap, config, dummy);
} else if (is_cpu(AMD)) } else if (is_cpu(AMD))
config = 2; config = 2;
else if (is_cpu(CYRIX) || is_cpu(CENTAUR)) else if (is_cpu(CYRIX) || is_cpu(CENTAUR))

1
arch/x86/kernel/cpu/mtrr/mtrr.h
View File

@ -5,7 +5,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#define MTRRcap_MSR 0x0fe
#define MTRRdefType_MSR 0x2ff #define MTRRdefType_MSR 0x2ff
#define MTRRfix64K_00000_MSR 0x250 #define MTRRfix64K_00000_MSR 0x250