leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2006-07-01 19:29:12 -07:00 committed by Linus Torvalds
parent d18ecedc02
commit af0f4d3609
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm26/kernel/irq.c
View File

@ -190,7 +190,7 @@ __do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)
int ret; int ret;
spin_unlock(&irq_controller_lock); spin_unlock(&irq_controller_lock);
if (!(action->flags & SA_INTERRUPT)) if (!(action->flags & IRQF_DISABLED))
local_irq_enable(); local_irq_enable();
status = 0; status = 0;
@ -201,7 +201,7 @@ __do_irq(unsigned int irq, struct irqaction *action, struct pt_regs *regs)
action = action->next; action = action->next;
} while (action); } while (action);
if (status & SA_SAMPLE_RANDOM) if (status & IRQF_SAMPLE_RANDOM)
add_interrupt_randomness(irq); add_interrupt_randomness(irq);
spin_lock_irq(&irq_controller_lock); spin_lock_irq(&irq_controller_lock);
@ -451,7 +451,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
* so we have to be careful not to interfere with a * so we have to be careful not to interfere with a
* running system. * running system.
*/ */
if (new->flags & SA_SAMPLE_RANDOM) { if (new->flags & IRQF_SAMPLE_RANDOM) {
/* /*
* This function might sleep, we want to call it first, * This function might sleep, we want to call it first,
* outside of the atomic block. * outside of the atomic block.
@ -471,7 +471,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
p = &desc->action; p = &desc->action;
if ((old = *p) != NULL) { if ((old = *p) != NULL) {
/* Can't share interrupts unless both agree to */ /* Can't share interrupts unless both agree to */
if (!(old->flags & new->flags & SA_SHIRQ)) { if (!(old->flags & new->flags & IRQF_SHARED)) {
spin_unlock_irqrestore(&irq_controller_lock, flags); spin_unlock_irqrestore(&irq_controller_lock, flags);
return -EBUSY; return -EBUSY;
} }
@ -526,11 +526,11 @@ int setup_irq(unsigned int irq, struct irqaction *new)
* *
* Flags: * Flags:
* *
* SA_SHIRQ Interrupt is shared * IRQF_SHARED Interrupt is shared
* *
* SA_INTERRUPT Disable local interrupts while processing * IRQF_DISABLED Disable local interrupts while processing
* *
* SA_SAMPLE_RANDOM The interrupt can be used for entropy * IRQF_SAMPLE_RANDOM The interrupt can be used for entropy
* *
*/ */
@ -542,7 +542,7 @@ int request_irq(unsigned int irq, irqreturn_t (*handler)(int, void *, struct pt_
struct irqaction *action; struct irqaction *action;
if (irq >= NR_IRQS || !irq_desc[irq].valid || !handler || if (irq >= NR_IRQS || !irq_desc[irq].valid || !handler ||
(irq_flags & SA_SHIRQ && !dev_id)) (irq_flags & IRQF_SHARED && !dev_id))
return -EINVAL; return -EINVAL;
action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL); action = (struct irqaction *)kmalloc(sizeof(struct irqaction), GFP_KERNEL);

2
arch/arm26/kernel/time.c
View File

@ -205,7 +205,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction timer_irq = { static struct irqaction timer_irq = {
.name = "timer", .name = "timer",
.flags = SA_INTERRUPT, .flags = IRQF_DISABLED,
.handler = timer_interrupt, .handler = timer_interrupt,
}; };

2
include/asm-arm26/floppy.h
View File

@ -22,7 +22,7 @@
#define fd_inb(port) inb((port)) #define fd_inb(port) inb((port))
#define fd_request_irq() request_irq(IRQ_FLOPPYDISK,floppy_interrupt,\ #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_free_irq() free_irq(IRQ_FLOPPYDISK,NULL)
#define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK) #define fd_disable_irq() disable_irq(IRQ_FLOPPYDISK)
#define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK) #define fd_enable_irq() enable_irq(IRQ_FLOPPYDISK)

2
include/asm-arm26/signal.h
View File

@ -82,7 +82,6 @@ typedef unsigned long sigset_t;
* is running in 26-bit. * is running in 26-bit.
* SA_ONSTACK allows alternate signal stacks (see sigaltstack(2)). * SA_ONSTACK allows alternate signal stacks (see sigaltstack(2)).
* SA_RESTART flag to get restarting signals (which were the default long ago) * 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_NODEFER prevents the current signal from being masked in the handler.
* SA_RESETHAND clears the handler when the signal is delivered. * 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_NOMASK SA_NODEFER
#define SA_ONESHOT SA_RESETHAND #define SA_ONESHOT SA_RESETHAND
#define SA_INTERRUPT 0x20000000 /* dummy -- ignored */
/* /*