diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-23 11:04:59 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 16:43:01 +0200 |
| commit | 6d2f16a8917eb77a8b79849686159f3a5eae2501 (patch) | |
| tree | eddcb022e805523873fccf30ce3d9a21d27dc41d /arch/m68k/kernel/ints.c | |
| parent | [PATCH] m68k: use proper defines for zone initialization (diff) | |
| download | linux-6d2f16a8917eb77a8b79849686159f3a5eae2501.tar.xz linux-6d2f16a8917eb77a8b79849686159f3a5eae2501.zip | |
[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: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k/kernel/ints.c')
| -rw-r--r-- | arch/m68k/kernel/ints.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 514d323ad536..4b85514792e7 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c @@ -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]; |