All of lore.kernel.org
 help / color / mirror / Atom feed
* - fix-cut-and-paste-breakage-in-arch-powerpc-platforms-pseries-pseriesh.patch removed from -mm tree
@ 2007-02-16  8:02 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2007-02-16  8:02 UTC (permalink / raw)
  To: michael, paulus, mm-commits


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@ellerman.id.au>

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@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 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@ellerman.id.au are

origin.patch
git-powerpc.patch
powerpc-rtas-msi-support.patch

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2007-02-16  8:03 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-16  8:02 - fix-cut-and-paste-breakage-in-arch-powerpc-platforms-pseries-pseriesh.patch removed from -mm tree akpm

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.