---

yaml --- r: 234836 b: refs/heads/master c: eff9073 h: refs/heads/master v: v3
git-mirror · Jan 31, 2011 · 54930ed · 54930ed
1 parent 519efd2
commit 54930ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e62445b90ac4ef708bd11c7ae052b1d5ef765b5
+refs/heads/master: eff9073790e1286aa12bf1c65814d3e0132b12e1
diff --git a/trunk/arch/x86/include/asm/numa_32.h b/trunk/arch/x86/include/asm/numa_32.h
@@ -6,7 +6,7 @@ extern int numa_off;
 extern int pxm_to_nid(int pxm);
 
 #ifdef CONFIG_NUMA
-extern int __cpuinit numa_cpu_node(int apicid);
+extern int __cpuinit numa_cpu_node(int cpu);
 #else	/* CONFIG_NUMA */
 static inline int numa_cpu_node(int cpu)		{ return NUMA_NO_NODE; }
 #endif	/* CONFIG_NUMA */