From: Matt Fleming <matt@console-pimps.org>
Date: Wed, 28 Apr 2010 11:11:30 +0000 (+0000)
Subject: sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1483feac74fdfd84a7ed7586c66482842e3b6e86;p=openwrt%2Fstaging%2Fblogic.git

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>
---

diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 86cd6f94b53b..509b36b45115 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;
 }