summaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel/smp.c
diff options
context:
space:
mode:
authorMatt Fleming <matt@console-pimps.org>2010-04-28 11:11:30 +0000
committerPaul Mundt <lethal@linux-sh.org>2010-04-29 23:28:38 +0900
commit1483feac74fdfd84a7ed7586c66482842e3b6e86 (patch)
tree0982c4fa3f7434d08ad75c6b5306528f37e53651 /arch/sh/kernel/smp.c
parent5f737b39be9110bd64874f508bd89ba27746b17e (diff)
sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n
arch/sh/kernel/smp.c:164: error: conflicting types for 'native_cpu_disable' /home/matt/src/kernels/sh-2.6/arch/sh/include/asm/smp.h:48: error: previous declaration of 'native_cpu_disable' was here Signed-off-by: Matt Fleming <matt@console-pimps.org> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/smp.c')
-rw-r--r--arch/sh/kernel/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 86cd6f94b53..509b36b4511 100644
--- a/arch/sh/kernel/smp.c
+++ b/arch/sh/kernel/smp.c
@@ -161,7 +161,7 @@ int __cpu_disable(void)
return 0;
}
#else /* ... !CONFIG_HOTPLUG_CPU */
-int native_cpu_disable(void)
+int native_cpu_disable(unsigned int cpu)
{
return -ENOSYS;
}