diff --git a/[refs] b/[refs]
index 5f5f9a2684b3..529b2a4c69cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d34c08958fa36c7a8c3f8d9c0ebe6ec1ab744a68
+refs/heads/master: 55d4f22abc9f011c5db982f83377cdd38bb9a2a3
diff --git a/trunk/arch/x86/mm/k8topology_64.c b/trunk/arch/x86/mm/k8topology_64.c
index 36c6c4a91353..0ea66b532c35 100644
--- a/trunk/arch/x86/mm/k8topology_64.c
+++ b/trunk/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;