The patch titled
m68k: adjust to changed HARDIRQ_MASK
has been removed from the -mm tree. Its filename is
m68k-adjust-to-changed-hardirq_mask.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: m68k: adjust to changed HARDIRQ_MASK
From: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Adjust entry.S to the changed HARDIRQ_MASK, add a check to prevent it from
silently breaking again.
Signed-off-by: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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
--- a/arch/m68k/kernel/entry.S~m68k-adjust-to-changed-hardirq_mask
+++ a/arch/m68k/kernel/entry.S
@@ -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
--- a/arch/m68k/kernel/ints.c~m68k-adjust-to-changed-hardirq_mask
+++ a/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];
_
Patches currently in -mm which might be from zippel@xxxxxxxxxxxxxx are
origin.patch
git-kbuild.patch
64-bit-resources-kconfig-change.patch
affs_fill_super-%s-abuses-2.patch
time-use-clocksource-abstraction-for-ntp-adjustments-optimize-out-some-mults-since-gcc-cant-avoid-them.patch
time-rename-clocksource-functions.patch
fix-and-optimize-clock-source-update.patch
fix-rt-mutex-defaults-and-dependencies.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
