The patch titled uml: remove some leftover PPC code has been added to the -mm tree. Its filename is uml-remove-some-leftover-ppc-code.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: uml: remove some leftover PPC code From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> I happened to notice that this code is a leftover and it should be removed - since there are sporadical efforts to revive the PPC port doing such cleanups is not useless. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx> Cc: Jeff Dike <jdike@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- include/asm-um/archparam-ppc.h | 9 --------- 1 files changed, 9 deletions(-) diff -puN include/asm-um/archparam-ppc.h~uml-remove-some-leftover-ppc-code include/asm-um/archparam-ppc.h --- a/include/asm-um/archparam-ppc.h~uml-remove-some-leftover-ppc-code +++ a/include/asm-um/archparam-ppc.h @@ -1,15 +1,6 @@ #ifndef __UM_ARCHPARAM_PPC_H #define __UM_ARCHPARAM_PPC_H -/********* Bits for asm-um/hw_irq.h **********/ - -struct hw_interrupt_type; - -/********* Bits for asm-um/hardirq.h **********/ - -#define irq_enter(cpu, irq) hardirq_enter(cpu) -#define irq_exit(cpu, irq) hardirq_exit(cpu) - /********* Bits for asm-um/string.h **********/ #define __HAVE_ARCH_STRRCHR _ Patches currently in -mm which might be from blaisorblade@xxxxxxxx are uml-mode_tt-is-bust.patch fix-typo-in-memory-barrier-docs.patch uml-remove-some-leftover-ppc-code.patch uml-split-memory-allocation-prototypes-out-of-userh.patch uml-fix-prototypes.patch uml-make-execvp-safe-for-our-usage.patch uml-code-convention-cleanup-of-a-file.patch uml-reenable-compilation-of-enable_timer-disabled-by-mistake.patch uml-use-defconfig_list-to-avoid-reading-hosts-config.patch uml-cleanup-run_helper-api-to-fix-a-leak.patch uml-kconfig-silence-warning.patch uml-mmapper-remove-just-added-but-wrong-const-attribute.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