Commit bc2e2635 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds

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

Use the new IRQF_ constants and remove the SA_INTERRUPT define
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent aa7135ff
...@@ -81,7 +81,7 @@ void distribute_irqs(struct irq_group *group, unsigned long irqmask) ...@@ -81,7 +81,7 @@ void distribute_irqs(struct irq_group *group, unsigned long irqmask)
if (action) { if (action) {
int status = 0; int status = 0;
// if (!(action->flags & SA_INTERRUPT)) // if (!(action->flags & IRQF_DISABLED))
// local_irq_enable(); // local_irq_enable();
do { do {
...@@ -90,7 +90,7 @@ void distribute_irqs(struct irq_group *group, unsigned long irqmask) ...@@ -90,7 +90,7 @@ void distribute_irqs(struct irq_group *group, unsigned long irqmask)
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);
local_irq_disable(); local_irq_disable();
} }
......
...@@ -341,11 +341,11 @@ asmlinkage void do_NMI(void) ...@@ -341,11 +341,11 @@ asmlinkage void do_NMI(void)
* *
* 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
* *
*/ */
...@@ -365,7 +365,7 @@ int request_irq(unsigned int irq, ...@@ -365,7 +365,7 @@ int request_irq(unsigned int irq,
* to figure out which interrupt is which (messes up the * to figure out which interrupt is which (messes up the
* interrupt freeing logic etc). * interrupt freeing logic etc).
*/ */
if (irqflags & SA_SHIRQ) { if (irqflags & IRQF_SHARED) {
if (!dev_id) if (!dev_id)
printk("Bad boy: %s (at 0x%x) called us without a dev_id!\n", printk("Bad boy: %s (at 0x%x) called us without a dev_id!\n",
devname, (&irq)[-1]); devname, (&irq)[-1]);
...@@ -576,7 +576,7 @@ int setup_irq(unsigned int irq, struct irqaction *new) ...@@ -576,7 +576,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.
...@@ -592,7 +592,7 @@ int setup_irq(unsigned int irq, struct irqaction *new) ...@@ -592,7 +592,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
spin_lock_irqsave(&level->lock, flags); spin_lock_irqsave(&level->lock, flags);
/* can't share interrupts unless all parties agree to */ /* can't share interrupts unless all parties agree to */
if (level->usage != 0 && !(level->flags & new->flags & SA_SHIRQ)) { if (level->usage != 0 && !(level->flags & new->flags & IRQF_SHARED)) {
spin_unlock_irqrestore(&level->lock,flags); spin_unlock_irqrestore(&level->lock,flags);
return -EBUSY; return -EBUSY;
} }
......
...@@ -47,7 +47,7 @@ unsigned long __delay_loops_MHz; ...@@ -47,7 +47,7 @@ unsigned long __delay_loops_MHz;
static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs *regs); static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs *regs);
static struct irqaction timer_irq = { static struct irqaction timer_irq = {
timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE, "timer", NULL, NULL
}; };
static inline int set_rtc_mmss(unsigned long nowtime) static inline int set_rtc_mmss(unsigned long nowtime)
......
...@@ -51,7 +51,7 @@ struct irq_source { ...@@ -51,7 +51,7 @@ struct irq_source {
struct irq_level { struct irq_level {
int usage; int usage;
int disable_count; int disable_count;
unsigned long flags; /* current SA_INTERRUPT and SA_SHIRQ settings */ unsigned long flags; /* current IRQF_DISABLED and IRQF_SHARED settings */
spinlock_t lock; spinlock_t lock;
struct irq_source *sources; struct irq_source *sources;
}; };
......
...@@ -74,7 +74,6 @@ typedef unsigned long sigset_t; ...@@ -74,7 +74,6 @@ typedef unsigned long sigset_t;
* SA_FLAGS values: * SA_FLAGS values:
* *
* SA_ONSTACK indicates that a registered stack_t will be used. * SA_ONSTACK indicates that a registered stack_t will be used.
* 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_RESTART flag to get restarting signals (which were the default long ago)
* SA_NOCLDSTOP flag to turn off SIGCHLD when children stop. * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
* SA_RESETHAND clears the handler when the signal is delivered. * SA_RESETHAND clears the handler when the signal is delivered.
...@@ -94,7 +93,6 @@ typedef unsigned long sigset_t; ...@@ -94,7 +93,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 */
#define SA_RESTORER 0x04000000 #define SA_RESTORER 0x04000000
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment