aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/k8topology_64.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-05-12 09:43:35 -0400
committerThomas Gleixner <tglx@linutronix.de>2008-05-25 02:58:26 -0400
commitd34c08958fa36c7a8c3f8d9c0ebe6ec1ab744a68 (patch)
treee989d4877ade8ad082224f315c51af68b35dbb8d /arch/x86/mm/k8topology_64.c
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>
Diffstat (limited to 'arch/x86/mm/k8topology_64.c')
-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)
76{ 76{
77 unsigned long prevbase; 77 unsigned long prevbase;
78 struct bootnode nodes[8]; 78 struct bootnode nodes[8];
79 int nodeid, i, nb; 79 int i, nb;
80 unsigned char nodeids[8]; 80 unsigned char nodeids[8];
81 int found = 0; 81 int found = 0;
82 u32 reg; 82 u32 nodeid, reg;
83 unsigned numnodes; 83 unsigned numnodes;
84 unsigned cores; 84 unsigned cores;
85 unsigned bits; 85 unsigned bits;
@@ -106,7 +106,6 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
106 prevbase = 0; 106 prevbase = 0;
107 for (i = 0; i < 8; i++) { 107 for (i = 0; i < 8; i++) {
108 unsigned long base, limit; 108 unsigned long base, limit;
109 u32 nodeid;
110 109
111 base = read_pci_config(0, nb, 1, 0x40 + i*8); 110 base = read_pci_config(0, nb, 1, 0x40 + i*8);
112 limit = read_pci_config(0, nb, 1, 0x44 + i*8); 111 limit = read_pci_config(0, nb, 1, 0x44 + i*8);