[S390] zcrypt: fix possible dead lock in AP bus module

[powerpc.git] / drivers / macintosh / macio-adb.c

diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c
index 4b08852..026b67f 100644 (file)
--- a/drivers/macintosh/macio-adb.c
+++ b/drivers/macintosh/macio-adb.c
@@ -6,7 +6,6 @@
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <asm/prom.h>
@@ -64,7 +63,7 @@ static DEFINE_SPINLOCK(macio_lock);
 
 static int macio_probe(void);
 static int macio_init(void);
-static irqreturn_t macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs);
+static irqreturn_t macio_adb_interrupt(int irq, void *arg);
 static int macio_send_request(struct adb_request *req, int sync);
 static int macio_adb_autopoll(int devs);
 static void macio_adb_poll(void);
@@ -189,8 +188,7 @@ static int macio_send_request(struct adb_request *req, int sync)
        return 0;
 }
 
-static irqreturn_t macio_adb_interrupt(int irq, void *arg,
-                                      struct pt_regs *regs)
+static irqreturn_t macio_adb_interrupt(int irq, void *arg)
 {
        int i, n, err;
        struct adb_request *req = NULL;
@@ -260,7 +258,7 @@ static irqreturn_t macio_adb_interrupt(int irq, void *arg,
                (*done)(req);
        }
        if (ibuf_len)
-               adb_input(ibuf, ibuf_len, regs, autopoll);
+               adb_input(ibuf, ibuf_len, autopoll);
 
        return IRQ_RETVAL(handled);
 }
@@ -271,6 +269,6 @@ static void macio_adb_poll(void)
 
        local_irq_save(flags);
        if (in_8(&adb->intr.r) != 0)
-               macio_adb_interrupt(0, NULL, NULL);
+               macio_adb_interrupt(0, NULL);
        local_irq_restore(flags);
 }