diff --git a/[refs] b/[refs]
index 4aaddd990cfc..5f5f9a2684b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eafe234a2571f51ef9f7e8baddb58c828750771
+refs/heads/master: d34c08958fa36c7a8c3f8d9c0ebe6ec1ab744a68
diff --git a/trunk/arch/x86/mm/k8topology_64.c b/trunk/arch/x86/mm/k8topology_64.c
index 48471199887d..36c6c4a91353 100644
--- a/trunk/arch/x86/mm/k8topology_64.c
+++ b/trunk/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);