Message ID | 20090416190536.626536145@am.sony.com |
---|---|
State | Accepted, archived |
Commit | d8f48457d5af6601abdecaad7a95c45bfeef90d5 |
Delegated to: | Paul Mackerras |
Headers | show |
--- a/arch/powerpc/platforms/ps3/setup.c +++ b/arch/powerpc/platforms/ps3/setup.c @@ -45,10 +45,6 @@ DEFINE_MUTEX(ps3_gpu_mutex); EXPORT_SYMBOL_GPL(ps3_gpu_mutex); -#if !defined(CONFIG_SMP) -static void smp_send_stop(void) {} -#endif - static union ps3_firmware_version ps3_firmware_version; void ps3_get_firmware_version(union ps3_firmware_version *v)
A non-SMP version of smp_send_stop() is now included in smp.h. Remove the unneeded def in the PS3 smp.c. Fixes build errors like these when CONFIG_SMP=n: arch/powerpc/platforms/ps3/setup.c:49: error: redefinition of 'smp_send_stop' include/linux/smp.h:125: error: previous definition of 'smp_send_stop' was here Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> --- arch/powerpc/platforms/ps3/setup.c | 4 ---- 1 file changed, 4 deletions(-)