summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-05-12 15:43:35 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 08:58:26 +0200
commitd34c08958fa36c7a8c3f8d9c0ebe6ec1ab744a68 (patch)
treee989d4877ade8ad082224f315c51af68b35dbb8d
parent0eafe234a2571f51ef9f7e8baddb58c828750771 (diff)
x86: k8topology fix shadow variable
sparse mutters: arch/x86/mm/k8topology_64.c:108:7: warning: symbol 'nodeid' shadows an earlier one Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/x86/mm/k8topology_64.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c
index 48471199887d..36c6c4a91353 100644
--- a/arch/x86/mm/k8topology_64.c
+++ b/arch/x86/mm/k8topology_64.c
@@ -76,10 +76,10 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
{
unsigned long prevbase;
struct bootnode nodes[8];
- int nodeid, i, nb;
+ int i, nb;
unsigned char nodeids[8];
int found = 0;
- u32 reg;
+ u32 nodeid, reg;
unsigned numnodes;
unsigned cores;
unsigned bits;
@@ -106,7 +106,6 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
prevbase = 0;
for (i = 0; i < 8; i++) {
unsigned long base, limit;
- u32 nodeid;
base = read_pci_config(0, nb, 1, 0x40 + i*8);
limit = read_pci_config(0, nb, 1, 0x44 + i*8);