diff for duplicates of <20110414222719.GA16256@digium.com> diff --git a/a/1.txt b/N1/1.txt index ab5388c..ce3c020 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,9 @@ This fixes a regression from b987812b3fcaf70fdf0037589e5d2f5f2453e6ce "powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP" which resulted in -arch/powerpc/kernel/crash.c: In function =E2=80=98default_machine_crash_s= -hutdown=E2=80=99: - arch/powerpc/kernel/crash.c:349: error: implicit declaration of functio= -n - =E2=80=98crash_kexec_wait_realmode=E2=80=99 +arch/powerpc/kernel/crash.c: In function ‘default_machine_crash_shutdown’: + arch/powerpc/kernel/crash.c:349: error: implicit declaration of function + ‘crash_kexec_wait_realmode’ message on when compiling on Blue&White G3 and CONFIG_SMP is not defined. @@ -20,13 +18,13 @@ index 3d3d416..5e6e37f 100644 +++ b/arch/powerpc/kernel/crash.c @@ -255,6 +255,9 @@ void crash_kexec_secondary(struct pt_regs *regs) { - cpus_in_sr =3D CPU_MASK_NONE; + cpus_in_sr = CPU_MASK_NONE; } + +static inline void crash_kexec_wait_realmode(int cpu) {} + #endif -=20 + /* ---=20 +-- 1.7.4.3 diff --git a/a/content_digest b/N1/content_digest index 08926e8..1cb6b85 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,18 +3,16 @@ "Date\0Thu, 14 Apr 2011 17:27:19 -0500\0" "To\0Paul Gortmaker <paul.gortmaker@windriver.com>" " Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - " linux-kernel@vger.kernel.org\0" + "Cc\0linux-kernel@vger.kernel.org" + " linuxppc-dev@lists.ozlabs.org\0" "\00:1\0" "b\0" "This fixes a regression from b987812b3fcaf70fdf0037589e5d2f5f2453e6ce\n" "\"powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP\" which resulted in\n" "\n" - "arch/powerpc/kernel/crash.c: In function =E2=80=98default_machine_crash_s=\n" - "hutdown=E2=80=99:\n" - " arch/powerpc/kernel/crash.c:349: error: implicit declaration of functio=\n" - "n\n" - " =E2=80=98crash_kexec_wait_realmode=E2=80=99\n" + "arch/powerpc/kernel/crash.c: In function \342\200\230default_machine_crash_shutdown\342\200\231:\n" + " arch/powerpc/kernel/crash.c:349: error: implicit declaration of function\n" + " \342\200\230crash_kexec_wait_realmode\342\200\231\n" "\n" "message on when compiling on Blue&White G3 and CONFIG_SMP is not defined.\n" "\n" @@ -29,15 +27,15 @@ "+++ b/arch/powerpc/kernel/crash.c\n" "@@ -255,6 +255,9 @@ void crash_kexec_secondary(struct pt_regs *regs)\n" " {\n" - " \tcpus_in_sr =3D CPU_MASK_NONE;\n" + " \tcpus_in_sr = CPU_MASK_NONE;\n" " }\n" "+\n" "+static inline void crash_kexec_wait_realmode(int cpu) {}\n" "+\n" " #endif\n" - "=20\n" + " \n" " /*\n" - "--=20\n" + "-- \n" 1.7.4.3 -837cbf5017f41505a291e268f1b7eaa0bf740d680b78e9b36b1f18d562aabdc3 +7d014ade5b7fb6ea142865ef7d92c2835ccd8546ac1bc94267ce834d26f71166
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.