From: Roman Zippel Adjust entry.S to the changed HARDIRQ_MASK, add a check to prevent it from silently breaking again. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton --- arch/m68k/kernel/entry.S | 4 ++-- arch/m68k/kernel/ints.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff -puN arch/m68k/kernel/entry.S~m68k-adjust-to-changed-hardirq_mask arch/m68k/kernel/entry.S --- devel/arch/m68k/kernel/entry.S~m68k-adjust-to-changed-hardirq_mask 2006-05-24 18:32:38.000000000 -0700 +++ devel-akpm/arch/m68k/kernel/entry.S 2006-05-24 18:32:38.000000000 -0700 @@ -226,7 +226,7 @@ ENTRY(nmi_handler) inthandler: SAVE_ALL_INT GET_CURRENT(%d0) - addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+2) + addqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) | put exception # in d0 bfextu %sp@(PT_VECTOR){#4,#10},%d0 @@ -245,7 +245,7 @@ inthandler: 3: addql #8,%sp | pop parameters off stack ret_from_interrupt: - subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+2) + subqb #1,%curptr@(TASK_INFO+TINFO_PREEMPT+1) jeq 1f 2: RESTORE_ALL diff -puN arch/m68k/kernel/ints.c~m68k-adjust-to-changed-hardirq_mask arch/m68k/kernel/ints.c --- devel/arch/m68k/kernel/ints.c~m68k-adjust-to-changed-hardirq_mask 2006-05-24 18:32:38.000000000 -0700 +++ devel-akpm/arch/m68k/kernel/ints.c 2006-05-24 18:32:38.000000000 -0700 @@ -95,6 +95,12 @@ void __init init_IRQ(void) { int i; + /* assembly irq entry code relies on this... */ + if (HARDIRQ_MASK != 0x00ff0000) { + extern void hardirq_mask_is_broken(void); + hardirq_mask_is_broken(); + } + for (i = 0; i < SYS_IRQS; i++) { if (mach_default_handler) irq_list[i].handler = (*mach_default_handler)[i]; _