The patch titled Fix cut and paste breakage in arch/powerpc/platforms/pseries/pseries.h has been removed from the -mm tree. Its filename was fix-cut-and-paste-breakage-in-arch-powerpc-platforms-pseries-pseriesh.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Fix cut and paste breakage in arch/powerpc/platforms/pseries/pseries.h From: Michael Ellerman <michael@xxxxxxxxxxxxxx> My "cleanup" patch (dce623e0827e8d0ad60ce7f385c3394bf1b0bae0) had a cut and paste error for the !CONFIG_KEXEC case. Fifty lashes for me. Signed-off-by: Michael Ellerman <michael@xxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/powerpc/platforms/pseries/pseries.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/powerpc/platforms/pseries/pseries.h~fix-cut-and-paste-breakage-in-arch-powerpc-platforms-pseries-pseriesh arch/powerpc/platforms/pseries/pseries.h --- a/arch/powerpc/platforms/pseries/pseries.h~fix-cut-and-paste-breakage-in-arch-powerpc-platforms-pseries-pseriesh +++ a/arch/powerpc/platforms/pseries/pseries.h @@ -29,8 +29,8 @@ static inline smp_init_pseries_xics(void extern void setup_kexec_cpu_down_xics(void); extern void setup_kexec_cpu_down_mpic(void); #else -static inline setup_kexec_cpu_down_xics(void) { }; -static inline setup_kexec_cpu_down_mpic(void) { }; +static inline void setup_kexec_cpu_down_xics(void) { } +static inline void setup_kexec_cpu_down_mpic(void) { } #endif #endif /* _PSERIES_PSERIES_H */ _ Patches currently in -mm which might be from michael@xxxxxxxxxxxxxx are origin.patch git-powerpc.patch powerpc-rtas-msi-support.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html