diff for duplicates of <49E8B015.7060808@am.sony.com> diff --git a/a/1.txt b/N1/1.txt index c142cf9..639da7f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,26 +1,30 @@ 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: +Fixes build errors like these when CONFIG_SMP=3Dn: - 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 + arch/powerpc/platforms/pasemi/setup.c:48: error: redefinition of =E2=80= +=98smp_send_stop=E2=80=99 + 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> --- -diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c +diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platfor= +ms/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 @@ - +=20 #include "pasemi.h" - +=20 -#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; +=20 diff --git a/a/content_digest b/N1/content_digest index 9bf15ac..988e3a7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,41 +3,44 @@ "Subject\0[patch] powerpc/pasemi: Fix no SMP build error\0" "Date\0Fri, 17 Apr 2009 09:36:37 -0700\0" "To\0Paul Mackerras <paulus@samba.org>\0" - "Cc\0subrata@linux.vnet.ibm.com" - Linuxppc-dev <Linuxppc-dev@ozlabs.org> - sachinp <sachinp@linux.vnet.ibm.com> + "Cc\0sachinp <sachinp@linux.vnet.ibm.com>" Stephen Rothwell <sfr@canb.auug.org.au> - linux-next <linux-next@vger.kernel.org> linux-kernel <linux-kernel@vger.kernel.org> + Linuxppc-dev <Linuxppc-dev@ozlabs.org> + linux-next <linux-next@vger.kernel.org> Olof Johansson <olof@lixom.net> - " Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" + " subrata@linux.vnet.ibm.com\0" "\00:1\0" "b\0" "A non-SMP version of smp_send_stop() is now included in smp.h.\n" "Remove the unneeded def in the pasemi setup.c.\n" "\n" - "Fixes build errors like these when CONFIG_SMP=n:\n" + "Fixes build errors like these when CONFIG_SMP=3Dn:\n" "\n" - " arch/powerpc/platforms/pasemi/setup.c:48: error: redefinition of \342\200\230smp_send_stop\342\200\231\n" - " include/linux/smp.h:125: error: previous definition of 'smp_send_stop' was here\n" + " arch/powerpc/platforms/pasemi/setup.c:48: error: redefinition of =E2=80=\n" + "=98smp_send_stop=E2=80=99\n" + " include/linux/smp.h:125: error: previous definition of 'smp_send_stop' =\n" + "was here\n" "\n" "Reported-by: subrata@linux.vnet.ibm.com\n" "Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>\n" "---\n" "\n" - "diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c\n" + "diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platfor=\n" + "ms/pasemi/setup.c\n" "index c64fb5b..153051e 100644\n" "--- a/arch/powerpc/platforms/pasemi/setup.c\n" "+++ b/arch/powerpc/platforms/pasemi/setup.c\n" "@@ -44,10 +44,6 @@\n" - " \n" + "=20\n" " #include \"pasemi.h\"\n" - " \n" + "=20\n" "-#if !defined(CONFIG_SMP)\n" "-static void smp_send_stop(void) {}\n" "-#endif\n" "-\n" " /* SDC reset register, must be pre-mapped at reset time */\n" - static void __iomem *reset_reg; + " static void __iomem *reset_reg;\n" + =20 -99b89dc32ed64a40474551aaedd0e9d51fcfaa608e8f8e0974160d702270f371 +e9e58d1792263f35d0ecdf571624dfcee777bb7fc2f7a3e7ab1ff67d66daa7d7
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.