Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d2f16a8 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

[PATCH] m68k: adjust to changed HARDIRQ_MASK 



Adjust entry.S to the changed HARDIRQ_MASK, add a check to prevent it from
silently breaking again.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2dcf15b7

arch/m68k/kernel/entry.S

+2 −2
Original line number Diff line number Diff line
@@ -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

arch/m68k/kernel/ints.c

+6 −0
Original line number Diff line number Diff line
@@ -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];