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>
This commit is contained in:
parent
5f737b39be
commit
1483feac74
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue