From 54930edd83a32a37906ba7cc483d3bc0a276f549 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 31 Jan 2011 16:59:05 +0100 Subject: [PATCH] --- yaml --- r: 234836 b: refs/heads/master c: eff9073790e1286aa12bf1c65814d3e0132b12e1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/numa_32.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bfeb4a97aee8..1a97ecbb3614 100644 --- 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 index bc66031afa1f..c6beed1ef103 100644 --- 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 */