aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm/k8topology_64.c
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
commit55d4f22abc9f011c5db982f83377cdd38bb9a2a3 (patch)
tree66bdffb027c57020b7c5eb9e664cca01c0cd22ef /arch/x86/mm/k8topology_64.c
parentx86: k8topology fix shadow variable (diff)
downloadlinux-dev-55d4f22abc9f011c5db982f83377cdd38bb9a2a3.tar.xz
linux-dev-55d4f22abc9f011c5db982f83377cdd38bb9a2a3.zip
x86: k8topology cleanup variable declarations
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.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c
index 36c6c4a91353..0ea66b532c35 100644
--- a/arch/x86/mm/k8topology_64.c
+++ b/arch/x86/mm/k8topology_64.c
@@ -74,17 +74,12 @@ static __init void early_get_boot_cpu_id(void)
int __init k8_scan_nodes(unsigned long start, unsigned long end)
{
+ unsigned numnodes, cores, bits, apicid_base;
unsigned long prevbase;
struct bootnode nodes[8];
- int i, nb;
unsigned char nodeids[8];
- int found = 0;
+ int i, j, nb, found = 0;
u32 nodeid, reg;
- unsigned numnodes;
- unsigned cores;
- unsigned bits;
- int j;
- unsigned apicid_base;
if (!early_pci_allowed())
return -1;