The patch titled remove-linux-hardirqh-from-asm-generic-localh-fix has been removed from the -mm tree. Its filename was remove-linux-hardirqh-from-asm-generic-localh-fix.patch This patch was dropped because it was folded into remove-linux-hardirqh-from-asm-generic-localh.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: remove-linux-hardirqh-from-asm-generic-localh-fix From: Alexey Dobriyan <adobriyan@xxxxxxxxx> On Sun, Dec 14, 2008 at 09:58:03AM -0800, Andrew Morton wrote: > On Sun, 14 Dec 2008 13:39:41 +0000 Russell King <rmk+lkml@xxxxxxxxxxxxxxxx> wrote: > > Note that x86 does not include asm/irq.h nor linux/hardirq.h in its > > asm/local.h, so this patch can be viewed as bringing the generic version > > into line with the x86 version. > > Sure. Includes are easy to add and hard to remove. I'll queue it up > and see if there's fallout. Here is some (but not everything): arch/avr32/kernel/traps.c:63: error: implicit declaration of function 'in_interrupt' arch/avr32/kernel/traps.c:113: error: implicit declaration of function 'nmi_enter' arch/avr32/kernel/traps.c:124: error: implicit declaration of function 'nmi_disable' arch/avr32/kernel/traps.c:127: error: implicit declaration of function 'nmi_exit' arch/sh/kernel/traps_32.c:104: error: implicit declaration of function 'in_interrupt' arch/sparc64/kernel/sysfs.c:201: error: 'cpuinfo_sparc' undeclared (first use in this function) arch/sparc64/kernel/mdesc.c:576: error: expected ')' before '*' token Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx> Cc: Steven Rostedt <rostedt@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/avr32/kernel/traps.c | 1 + arch/sh/kernel/traps_32.c | 1 + 2 files changed, 2 insertions(+) diff -puN arch/avr32/kernel/traps.c~remove-linux-hardirqh-from-asm-generic-localh-fix arch/avr32/kernel/traps.c --- a/arch/avr32/kernel/traps.c~remove-linux-hardirqh-from-asm-generic-localh-fix +++ a/arch/avr32/kernel/traps.c @@ -7,6 +7,7 @@ */ #include <linux/bug.h> +#include <linux/hardirq.h> #include <linux/init.h> #include <linux/kallsyms.h> #include <linux/kdebug.h> diff -puN arch/sh/kernel/traps_32.c~remove-linux-hardirqh-from-asm-generic-localh-fix arch/sh/kernel/traps_32.c --- a/arch/sh/kernel/traps_32.c~remove-linux-hardirqh-from-asm-generic-localh-fix +++ a/arch/sh/kernel/traps_32.c @@ -13,6 +13,7 @@ */ #include <linux/kernel.h> #include <linux/ptrace.h> +#include <linux/hardirq.h> #include <linux/init.h> #include <linux/spinlock.h> #include <linux/module.h> _ Patches currently in -mm which might be from adobriyan@xxxxxxxxx are origin.patch mm-report-the-pagesize-backing-a-vma-in-proc-pid-smaps.patch mm-report-the-mmu-pagesize-in-proc-pid-smaps.patch remove-remaining-unwinder-code.patch remove-linux-hardirqh-from-asm-generic-localh.patch remove-linux-hardirqh-from-asm-generic-localh-fix.patch softirq-introduce-statistics-for-softirq.patch proc-export-statistics-for-softirq-to-proc.patch proc-update-document-for-proc-softirqs-and-proc-stat.patch sm501-fix-section-mismatches.patch ipc-ipc_sysctlc-move-the-definition-of-ipc_auto_callback.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