The patch titled um: convert to asm-generic/hardirq.h has been added to the -mm tree. Its filename is um-convert-to-asm-generic-hardirqh.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: um: convert to asm-generic/hardirq.h From: Christoph Hellwig <hch@xxxxxx> Signed-off-by: Christoph Hellwig <hch@xxxxxx> Cc: Jeff Dike <jdike@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/include/asm/hardirq.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff -puN arch/um/include/asm/hardirq.h~um-convert-to-asm-generic-hardirqh arch/um/include/asm/hardirq.h --- a/arch/um/include/asm/hardirq.h~um-convert-to-asm-generic-hardirqh +++ a/arch/um/include/asm/hardirq.h @@ -1,25 +1 @@ -/* (c) 2004 cw@xxxxxxxx, GPLv2 blah blah */ - -#ifndef __ASM_UM_HARDIRQ_H -#define __ASM_UM_HARDIRQ_H - -#include <linux/threads.h> -#include <linux/irq.h> - -/* NOTE: When SMP works again we might want to make this - * ____cacheline_aligned or maybe use per_cpu state? --cw */ -typedef struct { - unsigned int __softirq_pending; -} irq_cpustat_t; - -#include <linux/irq_cpustat.h> - -/* As this would be very strange for UML to get we BUG() after the - * printk. */ -static inline void ack_bad_irq(unsigned int irq) -{ - printk(KERN_ERR "unexpected IRQ %02x\n", irq); - BUG(); -} - -#endif /* __ASM_UM_HARDIRQ_H */ +#include <asm-generic/hardirq.h> _ Patches currently in -mm which might be from hch@xxxxxx are origin.patch vfs-make-get_sb_pseudo-set-s_maxbytes-to-value-that-can-be-cast-to-signed.patch linux-next.patch vfs-fix-vfs_rename_dir-for-fs_rename_does_d_move-filesystems.patch vfs-split-generic_forget_inode-so-that-hugetlbfs-does-not-have-to-copy-it.patch vfs-allow-file-truncations-when-both-suid-and-write-permissions-set.patch vfs-remove-redundant-position-check-in-do_sendfile.patch vfs-change-sb-s_maxbytes-to-a-loff_t.patch alpha-convert-to-asm-generic-hardirqh.patch avr32-convert-to-asm-generic-hardirqh.patch cris-convert-to-asm-generic-hardirqh.patch frv-convert-to-asm-generic-hardirqh.patch h8300-convert-to-asm-generic-hardirqh.patch m32r-convert-to-asm-generic-hardirqh.patch m68k-convert-to-asm-generic-hardirqh.patch sparc32-convert-to-asm-generic-hardirqh.patch um-convert-to-asm-generic-hardirqh.patch xtensa-convert-to-asm-generic-hardirqh.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