Commit 1483feac authored by Matt Fleming's avatar Matt Fleming Committed by Paul Mundt

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: default avatarMatt Fleming <>
Signed-off-by: default avatarPaul Mundt <>
parent 5f737b39
......@@ -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;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment