diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-05-12 20:40:39 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-25 04:55:10 -0400 |
commit | 8004dd965b13b01a96def054d420f6df7ff22d53 (patch) | |
tree | e45157833daa023f579daff7ef907548ea6c9a7e /arch | |
parent | b79cd8f1268bab57ff85b19d131f7f23deab2dee (diff) |
x86: amd opteron TOM2 mask val fix
there is a typo in the mask value, need to remove that extra 0,
to avoid 4bit clearing.
Signed-off-by: Yinghal Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/mtrr/generic.c | 2 | ||||
-rw-r--r-- | arch/x86/pci/k8-bus_64.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index a83f5cd78885..509bd3d9eacd 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c | |||
@@ -233,7 +233,7 @@ void __init get_mtrr_state(void) | |||
233 | mtrr_tom2 = high; | 233 | mtrr_tom2 = high; |
234 | mtrr_tom2 <<= 32; | 234 | mtrr_tom2 <<= 32; |
235 | mtrr_tom2 |= low; | 235 | mtrr_tom2 |= low; |
236 | mtrr_tom2 &= 0xffffff8000000ULL; | 236 | mtrr_tom2 &= 0xffffff800000ULL; |
237 | } | 237 | } |
238 | if (mtrr_show) { | 238 | if (mtrr_show) { |
239 | int high_width; | 239 | int high_width; |
diff --git a/arch/x86/pci/k8-bus_64.c b/arch/x86/pci/k8-bus_64.c index 5c2799c20e47..bfefdf0f40d4 100644 --- a/arch/x86/pci/k8-bus_64.c +++ b/arch/x86/pci/k8-bus_64.c | |||
@@ -384,7 +384,7 @@ static int __init early_fill_mp_bus_info(void) | |||
384 | /* need to take out [0, TOM) for RAM*/ | 384 | /* need to take out [0, TOM) for RAM*/ |
385 | address = MSR_K8_TOP_MEM1; | 385 | address = MSR_K8_TOP_MEM1; |
386 | rdmsrl(address, val); | 386 | rdmsrl(address, val); |
387 | end = (val & 0xffffff8000000ULL); | 387 | end = (val & 0xffffff800000ULL); |
388 | printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20); | 388 | printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20); |
389 | if (end < (1ULL<<32)) | 389 | if (end < (1ULL<<32)) |
390 | update_range(range, 0, end - 1); | 390 | update_range(range, 0, end - 1); |
@@ -478,7 +478,7 @@ static int __init early_fill_mp_bus_info(void) | |||
478 | /* TOP_MEM2 */ | 478 | /* TOP_MEM2 */ |
479 | address = MSR_K8_TOP_MEM2; | 479 | address = MSR_K8_TOP_MEM2; |
480 | rdmsrl(address, val); | 480 | rdmsrl(address, val); |
481 | end = (val & 0xffffff8000000ULL); | 481 | end = (val & 0xffffff800000ULL); |
482 | printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20); | 482 | printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20); |
483 | update_range(range, 1ULL<<32, end - 1); | 483 | update_range(range, 1ULL<<32, end - 1); |
484 | } | 484 | } |