Commit 1483feac authored Apr 28, 2010 by Matt Fleming Committed by Paul Mundt Apr 29, 2010

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>

parent 5f737b39

arch/sh/kernel/smp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -161,7 +161,7 @@ int __cpu_disable(void)
	return 0;		return 0;
	}		}
	#else /* ... !CONFIG_HOTPLUG_CPU */		#else /* ... !CONFIG_HOTPLUG_CPU */
	int native_cpu_disable(void)		int native_cpu_disable(unsigned int cpu)
	{		{
	return -ENOSYS;		return -ENOSYS;
	}		}