diff options
author | Jaswinder Singh Rajput <jaswinderrajput@gmail.com> | 2009-05-14 02:59:25 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-05-15 10:49:01 -0400 |
commit | ba5673ff1ff5f428256db4cedd4b05b7be008bb6 (patch) | |
tree | 8f57573cc395c64c147629f95b0e202cc43dd21f /arch/x86/kernel/cpu/mtrr | |
parent | 654ac05801ae806661c8fdeb3b5c420a31cbc5b1 (diff) |
x86, mtrr: replace MTRRfix4K_C0000_MSR with msr-index's MSR_MTRRfix4K_C0000
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')
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/generic.c | 4 | ||||
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/mtrr.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index 00437c2e8dd3..3cf58e265345 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c | |||
@@ -22,7 +22,7 @@ struct fixed_range_block { | |||
22 | static struct fixed_range_block fixed_range_blocks[] = { | 22 | static struct fixed_range_block fixed_range_blocks[] = { |
23 | { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ | 23 | { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ |
24 | { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ | 24 | { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ |
25 | { MTRRfix4K_C0000_MSR, 8 }, /* eight 4k MTRRs */ | 25 | { MSR_MTRRfix4K_C0000, 8 }, /* eight 4k MTRRs */ |
26 | {} | 26 | {} |
27 | }; | 27 | }; |
28 | 28 | ||
@@ -199,7 +199,7 @@ get_fixed_ranges(mtrr_type * frs) | |||
199 | for (i = 0; i < 2; i++) | 199 | for (i = 0; i < 2; i++) |
200 | rdmsr(MSR_MTRRfix16K_80000 + i, p[2 + i * 2], p[3 + i * 2]); | 200 | rdmsr(MSR_MTRRfix16K_80000 + i, p[2 + i * 2], p[3 + i * 2]); |
201 | for (i = 0; i < 8; i++) | 201 | for (i = 0; i < 8; i++) |
202 | rdmsr(MTRRfix4K_C0000_MSR + i, p[6 + i * 2], p[7 + i * 2]); | 202 | rdmsr(MSR_MTRRfix4K_C0000 + i, p[6 + i * 2], p[7 + i * 2]); |
203 | } | 203 | } |
204 | 204 | ||
205 | void mtrr_save_fixed_ranges(void *info) | 205 | void mtrr_save_fixed_ranges(void *info) |
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h index 5053793f9124..e5ee686d2c39 100644 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h | |||
@@ -7,8 +7,6 @@ | |||
7 | 7 | ||
8 | #define MTRRdefType_MSR 0x2ff | 8 | #define MTRRdefType_MSR 0x2ff |
9 | 9 | ||
10 | #define MTRRfix4K_C0000_MSR 0x268 | ||
11 | |||
12 | #define MTRR_CHANGE_MASK_FIXED 0x01 | 10 | #define MTRR_CHANGE_MASK_FIXED 0x01 |
13 | #define MTRR_CHANGE_MASK_VARIABLE 0x02 | 11 | #define MTRR_CHANGE_MASK_VARIABLE 0x02 |
14 | #define MTRR_CHANGE_MASK_DEFTYPE 0x04 | 12 | #define MTRR_CHANGE_MASK_DEFTYPE 0x04 |