aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-04-30 20:11:51 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 10:55:09 +0200
commit0da72a4aeb4482c64c1142a2e36b556d13374937 (patch)
treef684a3ddff51ef1774e8e39c2b5dbf0a96f2c80e /arch/x86/kernel/cpu
parent75d3bce2fc0a80f435fe12f2c9ed2632c8ac29e4 (diff)
x86: fix sparse warning in mtrr/generic.c
arch/x86/kernel/cpu/mtrr/generic.c:216:12: warning: symbol 'lo' shadows an earlier one Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/mtrr/generic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index 5d241ce94a4..0625d4158e5 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -213,12 +213,12 @@ void __init get_mtrr_state(void)
mtrr_state.enabled = (lo & 0xc00) >> 10;
if (amd_special_default_mtrr()) {
- unsigned lo, hi;
+ unsigned low, high;
/* TOP_MEM2 */
- rdmsr(MSR_K8_TOP_MEM2, lo, hi);
- tom2 = hi;
+ rdmsr(MSR_K8_TOP_MEM2, low, high);
+ tom2 = high;
tom2 <<= 32;
- tom2 |= lo;
+ tom2 |= low;
tom2 &= 0xffffff8000000ULL;
}
if (mtrr_show) {