Patchwork powerpc/pasemi: Fix no SMP build error

login
register
mail settings
Submitter Geoff Levand
Date April 17, 2009, 4:36 p.m.
Message ID <49E8B015.7060808@am.sony.com>
Download mbox | patch
Permalink /patch/26130/
State Accepted
Commit 2d6b3de2374dd8c9f5ab23d57c7bbcda08553356
Delegated to: Paul Mackerras
Headers show

Comments

Geoff Levand - April 17, 2009, 4:36 p.m.
A non-SMP version of smp_send_stop() is now included in smp.h.
Remove the unneeded def in the pasemi setup.c.

Fixes build errors like these when CONFIG_SMP=n:

  arch/powerpc/platforms/pasemi/setup.c:48: error: redefinition of ‘smp_send_stop’
  include/linux/smp.h:125: error: previous definition of 'smp_send_stop' was here

Reported-by: subrata@linux.vnet.ibm.com
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
---
Olof Johansson - April 21, 2009, 5:25 p.m.
On Fri, Apr 17, 2009 at 09:36:37AM -0700, Geoff Levand wrote:
> A non-SMP version of smp_send_stop() is now included in smp.h.
> Remove the unneeded def in the pasemi setup.c.
> 
> Fixes build errors like these when CONFIG_SMP=n:
> 
>   arch/powerpc/platforms/pasemi/setup.c:48: error: redefinition of ???smp_send_stop???
>   include/linux/smp.h:125: error: previous definition of 'smp_send_stop' was here

Thanks for taking care of this.

> Reported-by: subrata@linux.vnet.ibm.com
> Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>


Acked-by: Olof Johansson <olof@lixom.net>


-Olof

Patch

diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c
index c64fb5b..153051e 100644
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -44,10 +44,6 @@ 
 
 #include "pasemi.h"
 
-#if !defined(CONFIG_SMP)
-static void smp_send_stop(void) {}
-#endif
-
 /* SDC reset register, must be pre-mapped at reset time */
 static void __iomem *reset_reg;