m68k: reverse Mac IRQ damage

Reverse the last of a monumental brown-paper-bag commit that went into the 2.3
kernel.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c
index a1c7ec7..303a3b5 100644 (file)
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
@@ -81,9 +81,9 @@ irqreturn_t baboon_irq(int irq, void *dev_id)
        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

diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 6369081..603d5cb 100644 (file)
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -109,12 +109,12 @@ irqreturn_t oss_irq(int irq, void *dev_id)
        /* 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 *dev_id)
        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;
                }
        }

diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c
index 15378a5..4011479 100644 (file)
--- a/arch/m68k/mac/psc.c
+++ b/arch/m68k/mac/psc.c
@@ -149,8 +149,8 @@ irqreturn_t psc_irq(int irq, void *dev_id)
        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);
                }
        }

diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c
index 2be7b9c..21b0318 100644 (file)
--- a/arch/m68k/mac/via.c
+++ b/arch/m68k/mac/via.c
@@ -430,8 +430,8 @@ irqreturn_t via1_irq(int irq, void *dev_id)
        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;
                }