Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / sparc64 / kernel / pci_schizo.c

diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 5c6e2a9b91f8000e88587e5b29a6bfdbbe030ffc..66911b126aed65a723954c7d2b4e287938eff6b1 100644 (file)
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -515,7 +515,7 @@ static void schizo_check_iommu_error(struct pci_controller_info *p,
 #define SCHIZO_UEAFSR_MTAG     0x000000000000e000UL /* Safari */
 #define SCHIZO_UEAFSR_ECCSYND  0x00000000000001ffUL /* Safari */
 
-static irqreturn_t schizo_ue_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t schizo_ue_intr(int irq, void *dev_id)
 {
        struct pci_controller_info *p = dev_id;
        unsigned long afsr_reg = p->pbm_B.controller_regs + SCHIZO_UE_AFSR;
@@ -603,7 +603,7 @@ static irqreturn_t schizo_ue_intr(int irq, void *dev_id, struct pt_regs *regs)
 #define SCHIZO_CEAFSR_MTAG     0x000000000000e000UL
 #define SCHIZO_CEAFSR_ECCSYND  0x00000000000001ffUL
 
-static irqreturn_t schizo_ce_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t schizo_ce_intr(int irq, void *dev_id)
 {
        struct pci_controller_info *p = dev_id;
        unsigned long afsr_reg = p->pbm_B.controller_regs + SCHIZO_CE_AFSR;
@@ -778,7 +778,7 @@ static irqreturn_t schizo_pcierr_intr_other(struct pci_pbm_info *pbm)
        return ret;
 }
 
-static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id)
 {
        struct pci_pbm_info *pbm = dev_id;
        struct pci_controller_info *p = pbm->parent;
@@ -933,7 +933,7 @@ static irqreturn_t schizo_pcierr_intr(int irq, void *dev_id, struct pt_regs *reg
 /* We only expect UNMAP errors here.  The rest of the Safari errors
  * are marked fatal and thus cause a system reset.
  */
-static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id)
 {
        struct pci_controller_info *p = dev_id;
        u64 errlog;
@@ -998,32 +998,32 @@ static void tomatillo_register_error_handlers(struct pci_controller_info *p)
        pbm = pbm_for_ino(p, SCHIZO_UE_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[1], schizo_ue_intr, SA_SHIRQ,
+               request_irq(op->irqs[1], schizo_ue_intr, IRQF_SHARED,
                            "TOMATILLO_UE", p);
 
        pbm = pbm_for_ino(p, SCHIZO_CE_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[2], schizo_ce_intr, SA_SHIRQ,
+               request_irq(op->irqs[2], schizo_ce_intr, IRQF_SHARED,
                            "TOMATILLO CE", p);
 
        pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ,
+               request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED,
                            "TOMATILLO PCIERR-A", pbm);
 
 
        pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ,
+               request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED,
                            "TOMATILLO PCIERR-B", pbm);
 
        pbm = pbm_for_ino(p, SCHIZO_SERR_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[3], schizo_safarierr_intr, SA_SHIRQ,
+               request_irq(op->irqs[3], schizo_safarierr_intr, IRQF_SHARED,
                            "TOMATILLO SERR", p);
 
        /* Enable UE and CE interrupts for controller. */
@@ -1106,32 +1106,32 @@ static void schizo_register_error_handlers(struct pci_controller_info *p)
        pbm = pbm_for_ino(p, SCHIZO_UE_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[1], schizo_ue_intr, SA_SHIRQ,
+               request_irq(op->irqs[1], schizo_ue_intr, IRQF_SHARED,
                            "SCHIZO_UE", p);
 
        pbm = pbm_for_ino(p, SCHIZO_CE_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[2], schizo_ce_intr, SA_SHIRQ,
+               request_irq(op->irqs[2], schizo_ce_intr, IRQF_SHARED,
                            "SCHIZO CE", p);
 
        pbm = pbm_for_ino(p, SCHIZO_PCIERR_A_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ,
+               request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED,
                            "SCHIZO PCIERR-A", pbm);
 
 
        pbm = pbm_for_ino(p, SCHIZO_PCIERR_B_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[0], schizo_pcierr_intr, SA_SHIRQ,
+               request_irq(op->irqs[0], schizo_pcierr_intr, IRQF_SHARED,
                            "SCHIZO PCIERR-B", pbm);
 
        pbm = pbm_for_ino(p, SCHIZO_SERR_INO);
        op = of_find_device_by_node(pbm->prom_node);
        if (op)
-               request_irq(op->irqs[3], schizo_safarierr_intr, SA_SHIRQ,
+               request_irq(op->irqs[3], schizo_safarierr_intr, IRQF_SHARED,
                            "SCHIZO SERR", p);
 
        /* Enable UE and CE interrupts for controller. */