Reverse the last of a monumental brown-paper-bag commit that went into the
2.3 kernel.
Signed-off-by: Finn Thain <fthain@xxxxxxxxxxxxxxxxxxx>
arch/m68k/mac/baboon.c | 2 +-
arch/m68k/mac/oss.c | 6 +++---
arch/m68k/mac/psc.c | 2 +-
arch/m68k/mac/via.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
Index: linux-2.6.20/arch/m68k/mac/oss.c
===================================================================
--- linux-2.6.20.orig/arch/m68k/mac/oss.c 2007-03-06 20:14:31.000000000 +1100
+++ linux-2.6.20/arch/m68k/mac/oss.c 2007-03-06 20:15:03.000000000 +1100
@@ -109,12 +109,12 @@ irqreturn_t oss_irq(int irq, void *dev_i
/* FIXME: how do you clear a pending IRQ? */
if (events & OSS_IP_SOUND) {
- /* FIXME: call sound handler */
oss->irq_pending &= ~OSS_IP_SOUND;
+ /* FIXME: call sound handler */
} else if (events & OSS_IP_SCSI) {
oss->irq_level[OSS_SCSI] = OSS_IRQLEV_DISABLED;
- m68k_handle_int(IRQ_MAC_SCSI);
oss->irq_pending &= ~OSS_IP_SCSI;
+ m68k_handle_int(IRQ_MAC_SCSI);
oss->irq_level[OSS_SCSI] = OSS_IRQLEV_SCSI;
} else {
/* FIXME: error check here? */
@@ -146,8 +146,8 @@ irqreturn_t oss_nubus_irq(int irq, void
for (i = 0, irq_bit = 1 ; i < 6 ; i++, irq_bit <<= 1) {
if (events & irq_bit) {
oss->irq_level[i] = OSS_IRQLEV_DISABLED;
- m68k_handle_int(NUBUS_SOURCE_BASE + i);
oss->irq_pending &= ~irq_bit;
+ m68k_handle_int(NUBUS_SOURCE_BASE + i);
oss->irq_level[i] = OSS_IRQLEV_NUBUS;
}
}
Index: linux-2.6.20/arch/m68k/mac/baboon.c
===================================================================
--- linux-2.6.20.orig/arch/m68k/mac/baboon.c 2007-03-06 20:14:31.000000000 +1100
+++ linux-2.6.20/arch/m68k/mac/baboon.c 2007-03-06 20:15:03.000000000 +1100
@@ -81,9 +81,9 @@ irqreturn_t baboon_irq(int irq, void *de
for (i = 0, irq_bit = 1 ; i < 3 ; i++, irq_bit <<= 1) {
if (events & irq_bit/* & baboon_active*/) {
baboon_active &= ~irq_bit;
+ baboon->mb_ifr &= ~irq_bit;
m68k_handle_int(IRQ_BABOON_0 + i);
baboon_active |= irq_bit;
- baboon->mb_ifr &= ~irq_bit;
}
}
#if 0
Index: linux-2.6.20/arch/m68k/mac/psc.c
===================================================================
--- linux-2.6.20.orig/arch/m68k/mac/psc.c 2007-03-06 20:14:31.000000000 +1100
+++ linux-2.6.20/arch/m68k/mac/psc.c 2007-03-06 20:15:03.000000000 +1100
@@ -149,8 +149,8 @@ irqreturn_t psc_irq(int irq, void *dev_i
for (i = 0, irq_bit = 1 ; i < 4 ; i++, irq_bit <<= 1) {
if (events & irq_bit) {
psc_write_byte(pIER, irq_bit);
- m68k_handle_int(base_irq + i);
psc_write_byte(pIFR, irq_bit);
+ m68k_handle_int(base_irq + i);
psc_write_byte(pIER, irq_bit | 0x80);
}
}
Index: linux-2.6.20/arch/m68k/mac/via.c
===================================================================
--- linux-2.6.20.orig/arch/m68k/mac/via.c 2007-03-06 20:14:57.000000000 +1100
+++ linux-2.6.20/arch/m68k/mac/via.c 2007-03-06 20:15:03.000000000 +1100
@@ -430,8 +430,8 @@ irqreturn_t via1_irq(int irq, void *dev_
for (i = 0, irq_bit = 1 ; i < 7 ; i++, irq_bit <<= 1)
if (events & irq_bit) {
via1[vIER] = irq_bit;
- m68k_handle_int(VIA1_SOURCE_BASE + i);
via1[vIFR] = irq_bit;
+ m68k_handle_int(VIA1_SOURCE_BASE + i);
via1[vIER] = irq_bit | 0x80;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
