diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 19:29:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 13:58:46 -0700 |
| commit | af0f4d3609d97dc5edbed759456ae568f6ac9ca1 (patch) | |
| tree | f68b089afed6d1cd98267d8304016183f52bdf52 /include | |
| parent | d18ecedc021351ca432a5b7e28d8f91c00957dc7 (diff) | |
| download | linux-stable-af0f4d3609d97dc5edbed759456ae568f6ac9ca1.tar.gz linux-stable-af0f4d3609d97dc5edbed759456ae568f6ac9ca1.tar.bz2 linux-stable-af0f4d3609d97dc5edbed759456ae568f6ac9ca1.zip | |
[PATCH] irq-flags: ARM26: 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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm26/floppy.h | 2 | ||||
| -rw-r--r-- | include/asm-arm26/signal.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-arm26/floppy.h b/include/asm-arm26/floppy.h index a18af069ca28..efb732165a4f 100644 --- a/include/asm-arm26/floppy.h +++ b/include/asm-arm26/floppy.h @@ -22,7 +22,7 @@ #define fd_inb(port) inb((port)) #define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\ - SA_INTERRUPT,"floppy",NULL) + IRQF_DISABLED,"floppy",NULL) #define fd_free_irq() free_irq(IRQ_FLOPPYDISK,NULL) #define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK) #define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK) diff --git a/include/asm-arm26/signal.h b/include/asm-arm26/signal.h index 37ad25355591..967ba4947e40 100644 --- a/include/asm-arm26/signal.h +++ b/include/asm-arm26/signal.h @@ -82,7 +82,6 @@ typedef unsigned long sigset_t; * is running in 26-bit. * SA_ONSTACK allows alternate signal stacks (see sigaltstack(2)). * SA_RESTART flag to get restarting signals (which were the default long ago) - * SA_INTERRUPT is a no-op, but left due to historical reasons. Use the * SA_NODEFER prevents the current signal from being masked in the handler. * SA_RESETHAND clears the handler when the signal is delivered. * @@ -101,7 +100,6 @@ typedef unsigned long sigset_t; #define SA_NOMASK SA_NODEFER #define SA_ONESHOT SA_RESETHAND -#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */ /* |