From: Jesper Nilsson - New file include/asm-cris/irq_regs.h. - Change handling of registers for do_IRQ. - Add GENERIC_HARDIRQS to Kconfig. Signed-off-by: Jesper Nilsson Acked-by: Mikael Starvik Signed-off-by: Andrew Morton --- arch/cris/Kconfig | 4 ++++ arch/cris/kernel/irq.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff -puN arch/cris/Kconfig~cris-build-fixes-irq-fixes arch/cris/Kconfig --- a/arch/cris/Kconfig~cris-build-fixes-irq-fixes +++ a/arch/cris/Kconfig @@ -57,6 +57,10 @@ menu "General setup" source "fs/Kconfig.binfmt" +config GENERIC_HARDIRQS + bool + default y + config ETRAX_CMDLINE string "Kernel command line" default "root=/dev/mtdblock3" diff -puN arch/cris/kernel/irq.c~cris-build-fixes-irq-fixes arch/cris/kernel/irq.c --- a/arch/cris/kernel/irq.c~cris-build-fixes-irq-fixes +++ a/arch/cris/kernel/irq.c @@ -2,7 +2,7 @@ * * linux/arch/cris/kernel/irq.c * - * Copyright (c) 2000,2001 Axis Communications AB + * Copyright (c) 2000,2007 Axis Communications AB * * Authors: Bjorn Wesen (bjornw@axis.com) * @@ -92,14 +92,16 @@ skip: asmlinkage void do_IRQ(int irq, struct pt_regs * regs) { unsigned long sp; + struct pt_regs *old_regs = set_irq_regs(regs); irq_enter(); sp = rdsp(); if (unlikely((sp & (PAGE_SIZE - 1)) < (PAGE_SIZE/8))) { printk("do_IRQ: stack overflow: %lX\n", sp); show_stack(NULL, (unsigned long *)sp); } - __do_IRQ(irq, regs); + __do_IRQ(irq); irq_exit(); + set_irq_regs(old_regs); } void weird_irq(void) _