* [PATCH] sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n
@ 2010-04-28 11:11 Matt Fleming
2010-04-29 14:29 ` Paul Mundt
0 siblings, 1 reply; 2+ messages in thread
From: Matt Fleming @ 2010-04-28 11:11 UTC (permalink / raw)
To: linux-sh
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>
---
arch/sh/kernel/smp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c
index 86cd6f9..509b36b 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;
}
--
1.6.4.rc0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n
2010-04-28 11:11 [PATCH] sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n Matt Fleming
@ 2010-04-29 14:29 ` Paul Mundt
0 siblings, 0 replies; 2+ messages in thread
From: Paul Mundt @ 2010-04-29 14:29 UTC (permalink / raw)
To: linux-sh
On Wed, Apr 28, 2010 at 12:11:30PM +0100, Matt Fleming wrote:
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-29 14:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-28 11:11 [PATCH] sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n Matt Fleming
2010-04-29 14:29 ` Paul Mundt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).