| Message ID | 49E8B015.7060808@am.sony.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 2d6b3de2374dd8c9f5ab23d57c7bbcda08553356 |
| Delegated to: | Paul Mackerras |
| Headers | show |
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
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;
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> ---