projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5f737b3)
sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n
authorMatt Fleming <matt@console-pimps.org>
Wed, 28 Apr 2010 11:11:30 +0000 (11:11 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Thu, 29 Apr 2010 14:28:38 +0000 (23:28 +0900)
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>
arch/sh/kernel/smp.c patch | blob | blame | history

diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 86cd6f94b53b604bfafcf88a50087ba5020ae272..509b36b451155ee5a7174c1d43fc0259d66e8ccd 100644 (file)
--- 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;
 }