Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 6f9afcd5ca4e..c110f8679bab 100644
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -801,6 +801,16 @@ static void closecard(int cardnr)
         ll_unload(csta);
 }
 
+static irqreturn_t card_irq(int intno, void *dev_id)
+{
+        struct IsdnCardState *cs = dev_id;
+        irqreturn_t ret = cs->irq_func(intno, cs);
+
+        if (ret == IRQ_HANDLED)
+                cs->irq_cnt++;
+        return ret;
+}
+
 static int init_card(struct IsdnCardState *cs)
 {
         int     irq_cnt, cnt = 3, ret;
@@ -809,10 +819,10 @@ static int init_card(struct IsdnCardState *cs)
                 ret = cs->cardmsg(cs, CARD_INIT, NULL);
                 return(ret);
         }
-        irq_cnt = kstat_irqs(cs->irq);
+        irq_cnt = cs->irq_cnt = 0;
         printk(KERN_INFO "%s: IRQ %d count %d\n", CardType[cs->typ],
                cs->irq, irq_cnt);
-        if (request_irq(cs->irq, cs->irq_func, cs->irq_flags, "HiSax", cs)) {
+        if (request_irq(cs->irq, card_irq, cs->irq_flags, "HiSax", cs)) {
                 printk(KERN_WARNING "HiSax: couldn't get interrupt %d\n",
                        cs->irq);
                 return 1;
@@ -822,8 +832,8 @@ static int init_card(struct IsdnCardState *cs)
                 /* Timeout 10ms */
                 msleep(10);
                 printk(KERN_INFO "%s: IRQ %d count %d\n",
-                       CardType[cs->typ], cs->irq, kstat_irqs(cs->irq));
-                if (kstat_irqs(cs->irq) == irq_cnt) {
+                       CardType[cs->typ], cs->irq, cs->irq_cnt);
+                if (cs->irq_cnt == irq_cnt) {
                         printk(KERN_WARNING
                                "%s: IRQ(%d) getting no interrupts during init %d\n",
                                CardType[cs->typ], cs->irq, 4 - cnt);
@@ -1907,7 +1917,7 @@ static void EChannel_proc_rcv(struct hisax_d_if *d_if)
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
 
-static struct pci_device_id hisax_pci_tbl[] __devinitdata = {
+static struct pci_device_id hisax_pci_tbl[] __devinitdata __used = {
 #ifdef CONFIG_HISAX_FRITZPCI
         {PCI_VDEVICE(AVM,      PCI_DEVICE_ID_AVM_A1)                    },
 #endif