7 files changed, 22 insertions, 25 deletions

diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index a1023bb1a21..8a9b470e1b6 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -140,7 +140,7 @@ int ebus_dma_irq_enable(struct ebus_dma_info *p, int on)
 
         if (on) {
                 if (p->flags & EBUS_DMA_FLAG_USE_EBDMA_HANDLER) {
-                        if (request_irq(p->irq, ebus_dma_irq, SA_SHIRQ, p->name, p))
+                        if (request_irq(p->irq, ebus_dma_irq, IRQF_SHARED, p->name, p))
                                 return -EBUSY;
                 }
 
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index bf7b32b3670..197a7ffd57e 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -863,11 +863,11 @@ static void psycho_register_error_handlers(struct pci_controller_info *p)
         if (op->num_irqs < 6)
                 return;
 
-        request_irq(op->irqs[1], psycho_ue_intr, SA_SHIRQ, "PSYCHO UE", p);
-        request_irq(op->irqs[2], psycho_ce_intr, SA_SHIRQ, "PSYCHO CE", p);
-        request_irq(op->irqs[5], psycho_pcierr_intr, SA_SHIRQ,
+        request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED, "PSYCHO UE", p);
+        request_irq(op->irqs[2], psycho_ce_intr, IRQF_SHARED, "PSYCHO CE", p);
+        request_irq(op->irqs[5], psycho_pcierr_intr, IRQF_SHARED,
                     "PSYCHO PCIERR-A", &p->pbm_A);
-        request_irq(op->irqs[0], psycho_pcierr_intr, SA_SHIRQ,
+        request_irq(op->irqs[0], psycho_pcierr_intr, IRQF_SHARED,
                     "PSYCHO PCIERR-B", &p->pbm_B);
 
         /* Enable UE and CE interrupts for controller. */
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index 5e087b0fb4c..45891850b90 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -854,14 +854,14 @@ static void sabre_register_error_handlers(struct pci_controller_info *p)
                      SABRE_UEAFSR_SDRD | SABRE_UEAFSR_SDWR |
                      SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE));
 
-        request_irq(op->irqs[1], sabre_ue_intr, SA_SHIRQ, "SABRE UE", p);
+        request_irq(op->irqs[1], sabre_ue_intr, IRQF_SHARED, "SABRE UE", p);
 
         sabre_write(base + SABRE_CE_AFSR,
                     (SABRE_CEAFSR_PDRD | SABRE_CEAFSR_PDWR |
                      SABRE_CEAFSR_SDRD | SABRE_CEAFSR_SDWR));
 
-        request_irq(op->irqs[2], sabre_ce_intr, SA_SHIRQ, "SABRE CE", p);
-        request_irq(op->irqs[0], sabre_pcierr_intr, SA_SHIRQ,
+        request_irq(op->irqs[2], sabre_ce_intr, IRQF_SHARED, "SABRE CE", p);
+        request_irq(op->irqs[0], sabre_pcierr_intr, IRQF_SHARED,
                     "SABRE PCIERR", p);
 
         tmp = sabre_read(base + SABRE_PCICTRL);
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 5c6e2a9b91f..75ade83ecc6 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -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. */
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c
index ef68aa4fec6..c49a5779574 100644
--- a/arch/sparc64/kernel/sbus.c
+++ b/arch/sparc64/kernel/sbus.c
@@ -1065,7 +1065,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
 
         irq = sbus_build_irq(sbus, SYSIO_UE_INO);
         if (request_irq(irq, sysio_ue_handler,
-                        SA_SHIRQ, "SYSIO UE", sbus) < 0) {
+                        IRQF_SHARED, "SYSIO UE", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register UE interrupt.\n",
                             sbus->portid);
                 prom_halt();
@@ -1073,7 +1073,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
 
         irq = sbus_build_irq(sbus, SYSIO_CE_INO);
         if (request_irq(irq, sysio_ce_handler,
-                        SA_SHIRQ, "SYSIO CE", sbus) < 0) {
+                        IRQF_SHARED, "SYSIO CE", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register CE interrupt.\n",
                             sbus->portid);
                 prom_halt();
@@ -1081,7 +1081,7 @@ static void __init sysio_register_error_handlers(struct sbus_bus *sbus)
 
         irq = sbus_build_irq(sbus, SYSIO_SBUSERR_INO);
         if (request_irq(irq, sysio_sbus_error_handler,
-                        SA_SHIRQ, "SYSIO SBUS Error", sbus) < 0) {
+                        IRQF_SHARED, "SYSIO SBUS Error", sbus) < 0) {
                 prom_printf("SYSIO[%x]: Cannot register SBUS Error interrupt.\n",
                             sbus->portid);
                 prom_halt();
diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
index b591d0e8d8f..abf15003801 100644
--- a/include/asm-sparc64/floppy.h
+++ b/include/asm-sparc64/floppy.h
@@ -267,7 +267,7 @@ static int sun_fd_request_irq(void)
                 once = 1;
 
                 error = request_irq(FLOPPY_IRQ, sparc_floppy_irq, 
-                                    SA_INTERRUPT, "floppy", NULL);
+                                    IRQF_DISABLED, "floppy", NULL);
 
                 return ((error == 0) ? 0 : -1);
         }
diff --git a/include/asm-sparc64/signal.h b/include/asm-sparc64/signal.h
index fdc42a14d4e..9968871103b 100644
--- a/include/asm-sparc64/signal.h
+++ b/include/asm-sparc64/signal.h
@@ -133,16 +133,13 @@ struct sigstack {
  * usage of signal stacks by using the (now obsolete) sa_restorer field in
  * the sigaction structure as a stack pointer. This is now possible due to
  * the changes in signal handling. LBT 010493.
- * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the
  * SA_RESTART flag to get restarting signals (which were the default long ago)
- * SA_SHIRQ flag is for shared interrupt support on PCI and EISA.
  */
 #define SA_NOCLDSTOP    _SV_IGNCHILD
 #define SA_STACK        _SV_SSTACK
 #define SA_ONSTACK      _SV_SSTACK
 #define SA_RESTART      _SV_INTR
 #define SA_ONESHOT      _SV_RESET
-#define SA_INTERRUPT    0x10u
 #define SA_NOMASK       0x20u
 #define SA_NOCLDWAIT    0x100u
 #define SA_SIGINFO      0x200u