The patch titled sparc32: convert to asm-generic/hardirq.h has been removed from the -mm tree. Its filename was sparc32-convert-to-asm-generic-hardirqh.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sparc32: convert to asm-generic/hardirq.h From: Christoph Hellwig <hch@xxxxxx> [akpm@xxxxxxxxxxxxxxxxxxxx: /arch/sparc/include/asm/irq_32.h: move NR_IRQS definition] Signed-off-by: Christoph Hellwig <hch@xxxxxx> Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/sparc/include/asm/hardirq_32.h | 12 +----------- arch/sparc/include/asm/irq_32.h | 4 ++-- 2 files changed, 3 insertions(+), 13 deletions(-) diff -puN arch/sparc/include/asm/hardirq_32.h~sparc32-convert-to-asm-generic-hardirqh arch/sparc/include/asm/hardirq_32.h --- a/arch/sparc/include/asm/hardirq_32.h~sparc32-convert-to-asm-generic-hardirqh +++ a/arch/sparc/include/asm/hardirq_32.h @@ -7,17 +7,7 @@ #ifndef __SPARC_HARDIRQ_H #define __SPARC_HARDIRQ_H -#include <linux/threads.h> -#include <linux/spinlock.h> -#include <linux/cache.h> - -/* entry.S is sensitive to the offsets of these fields */ /* XXX P3 Is it? */ -typedef struct { - unsigned int __softirq_pending; -} ____cacheline_aligned irq_cpustat_t; - -#include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ - #define HARDIRQ_BITS 8 +#include <asm-generic/hardirq.h> #endif /* __SPARC_HARDIRQ_H */ diff -puN arch/sparc/include/asm/irq_32.h~sparc32-convert-to-asm-generic-hardirqh arch/sparc/include/asm/irq_32.h --- a/arch/sparc/include/asm/irq_32.h~sparc32-convert-to-asm-generic-hardirqh +++ a/arch/sparc/include/asm/irq_32.h @@ -6,10 +6,10 @@ #ifndef _SPARC_IRQ_H #define _SPARC_IRQ_H -#include <linux/interrupt.h> - #define NR_IRQS 16 +#include <linux/interrupt.h> + #define irq_canonicalize(irq) (irq) extern void __init init_IRQ(void); _ Patches currently in -mm which might be from hch@xxxxxx are origin.patch linux-next.patch avr32-convert-to-asm-generic-hardirqh.patch vfs-fix-vfs_rename_dir-for-fs_rename_does_d_move-filesystems.patch fs-remove-unneeded-dcache_unhashed-tricks.patch xtensa-convert-to-asm-generic-hardirqh.patch vfs-implement-posix-o_sync-and-o_dsync-semantics.patch elf-kill-use_elf_core_dump.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