[PATCH] irq-flags: SPARC64: Use the new IRQF_ constants

Use the new IRQF_ constants and remove the SA_INTERRUPT define

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 1 insertions, 4 deletions

diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
index b591d0e8d8f0..abf150038019 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 fdc42a14d4e6..9968871103bc 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