Skip to content

Commit

Permalink
sh: native_cpu_disable() build error when CONFIG_HOTPLUG_CPU=n
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matt Fleming authored and Paul Mundt committed Apr 29, 2010
1 parent 5f737b3 commit 1483fea
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/sh/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 1483fea

Please sign in to comment.