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

[PATCH] irq-flags: SPARC: 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>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d356d7f4
...@@ -191,11 +191,11 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -191,11 +191,11 @@ int show_interrupts(struct seq_file *p, void *v)
} }
#endif #endif
seq_printf(p, " %c %s", seq_printf(p, " %c %s",
(action->flags & SA_INTERRUPT) ? '+' : ' ', (action->flags & IRQF_DISABLED) ? '+' : ' ',
action->name); action->name);
for (action=action->next; action; action = action->next) { for (action=action->next; action; action = action->next) {
seq_printf(p, ",%s %s", seq_printf(p, ",%s %s",
(action->flags & SA_INTERRUPT) ? " +" : "", (action->flags & IRQF_DISABLED) ? " +" : "",
action->name); action->name);
} }
seq_putc(p, '\n'); seq_putc(p, '\n');
...@@ -243,7 +243,7 @@ void free_irq(unsigned int irq, void *dev_id) ...@@ -243,7 +243,7 @@ void free_irq(unsigned int irq, void *dev_id)
printk("Trying to free free shared IRQ%d\n",irq); printk("Trying to free free shared IRQ%d\n",irq);
goto out_unlock; goto out_unlock;
} }
} else if (action->flags & SA_SHIRQ) { } else if (action->flags & IRQF_SHARED) {
printk("Trying to free shared IRQ%d with NULL device ID\n", irq); printk("Trying to free shared IRQ%d with NULL device ID\n", irq);
goto out_unlock; goto out_unlock;
} }
...@@ -395,9 +395,9 @@ int request_fast_irq(unsigned int irq, ...@@ -395,9 +395,9 @@ int request_fast_irq(unsigned int irq,
action = sparc_irq[cpu_irq].action; action = sparc_irq[cpu_irq].action;
if(action) { if(action) {
if(action->flags & SA_SHIRQ) if(action->flags & IRQF_SHARED)
panic("Trying to register fast irq when already shared.\n"); panic("Trying to register fast irq when already shared.\n");
if(irqflags & SA_SHIRQ) if(irqflags & IRQF_SHARED)
panic("Trying to register fast irq as shared.\n"); panic("Trying to register fast irq as shared.\n");
/* Anyway, someone already owns it so cannot be made fast. */ /* Anyway, someone already owns it so cannot be made fast. */
...@@ -497,11 +497,11 @@ int request_irq(unsigned int irq, ...@@ -497,11 +497,11 @@ int request_irq(unsigned int irq,
actionp = &sparc_irq[cpu_irq].action; actionp = &sparc_irq[cpu_irq].action;
action = *actionp; action = *actionp;
if (action) { if (action) {
if (!(action->flags & SA_SHIRQ) || !(irqflags & SA_SHIRQ)) { if (!(action->flags & IRQF_SHARED) || !(irqflags & IRQF_SHARED)) {
ret = -EBUSY; ret = -EBUSY;
goto out_unlock; goto out_unlock;
} }
if ((action->flags & SA_INTERRUPT) != (irqflags & SA_INTERRUPT)) { if ((action->flags & IRQF_DISABLED) != (irqflags & IRQF_DISABLED)) {
printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq); printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);
ret = -EBUSY; ret = -EBUSY;
goto out_unlock; goto out_unlock;
......
...@@ -745,7 +745,7 @@ void __init pci_time_init(void) ...@@ -745,7 +745,7 @@ void __init pci_time_init(void)
writel (PCI_COUNTER_IRQ_SET(timer_irq, 0), writel (PCI_COUNTER_IRQ_SET(timer_irq, 0),
pcic->pcic_regs+PCI_COUNTER_IRQ); pcic->pcic_regs+PCI_COUNTER_IRQ);
irq = request_irq(timer_irq, pcic_timer_handler, irq = request_irq(timer_irq, pcic_timer_handler,
(SA_INTERRUPT | SA_STATIC_ALLOC), "timer", NULL); (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL);
if (irq) { if (irq) {
prom_printf("time_init: unable to attach IRQ%d\n", timer_irq); prom_printf("time_init: unable to attach IRQ%d\n", timer_irq);
prom_halt(); prom_halt();
......
...@@ -179,7 +179,7 @@ static void __init sun4c_init_timers(irqreturn_t (*counter_fn)(int, void *, stru ...@@ -179,7 +179,7 @@ static void __init sun4c_init_timers(irqreturn_t (*counter_fn)(int, void *, stru
irq = request_irq(TIMER_IRQ, irq = request_irq(TIMER_IRQ,
counter_fn, counter_fn,
(SA_INTERRUPT | SA_STATIC_ALLOC), (IRQF_DISABLED | SA_STATIC_ALLOC),
"timer", NULL); "timer", NULL);
if (irq) { if (irq) {
prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ); prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);
......
...@@ -107,13 +107,13 @@ found_it: seq_printf(p, "%3d: ", i); ...@@ -107,13 +107,13 @@ found_it: seq_printf(p, "%3d: ", i);
kstat_cpu(cpu_logical_map(x)).irqs[i]); kstat_cpu(cpu_logical_map(x)).irqs[i]);
#endif #endif
seq_printf(p, "%c %s", seq_printf(p, "%c %s",
(action->flags & SA_INTERRUPT) ? '+' : ' ', (action->flags & IRQF_DISABLED) ? '+' : ' ',
action->name); action->name);
action = action->next; action = action->next;
for (;;) { for (;;) {
for (; action; action = action->next) { for (; action; action = action->next) {
seq_printf(p, ",%s %s", seq_printf(p, ",%s %s",
(action->flags & SA_INTERRUPT) ? " +" : "", (action->flags & IRQF_DISABLED) ? " +" : "",
action->name); action->name);
} }
if (!sbusl) break; if (!sbusl) break;
...@@ -160,7 +160,7 @@ void sun4d_free_irq(unsigned int irq, void *dev_id) ...@@ -160,7 +160,7 @@ void sun4d_free_irq(unsigned int irq, void *dev_id)
printk("Trying to free free shared IRQ%d\n",irq); printk("Trying to free free shared IRQ%d\n",irq);
goto out_unlock; goto out_unlock;
} }
} else if (action->flags & SA_SHIRQ) { } else if (action->flags & IRQF_SHARED) {
printk("Trying to free shared IRQ%d with NULL device ID\n", irq); printk("Trying to free shared IRQ%d with NULL device ID\n", irq);
goto out_unlock; goto out_unlock;
} }
...@@ -298,13 +298,13 @@ int sun4d_request_irq(unsigned int irq, ...@@ -298,13 +298,13 @@ int sun4d_request_irq(unsigned int irq,
action = *actionp; action = *actionp;
if (action) { if (action) {
if ((action->flags & SA_SHIRQ) && (irqflags & SA_SHIRQ)) { if ((action->flags & IRQF_SHARED) && (irqflags & IRQF_SHARED)) {
for (tmp = action; tmp->next; tmp = tmp->next); for (tmp = action; tmp->next; tmp = tmp->next);
} else { } else {
ret = -EBUSY; ret = -EBUSY;
goto out_unlock; goto out_unlock;
} }
if ((action->flags & SA_INTERRUPT) ^ (irqflags & SA_INTERRUPT)) { if ((action->flags & IRQF_DISABLED) ^ (irqflags & IRQF_DISABLED)) {
printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq); printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);
ret = -EBUSY; ret = -EBUSY;
goto out_unlock; goto out_unlock;
...@@ -490,7 +490,7 @@ static void __init sun4d_init_timers(irqreturn_t (*counter_fn)(int, void *, stru ...@@ -490,7 +490,7 @@ static void __init sun4d_init_timers(irqreturn_t (*counter_fn)(int, void *, stru
irq = request_irq(TIMER_IRQ, irq = request_irq(TIMER_IRQ,
counter_fn, counter_fn,
(SA_INTERRUPT | SA_STATIC_ALLOC), (IRQF_DISABLED | SA_STATIC_ALLOC),
"timer", NULL); "timer", NULL);
if (irq) { if (irq) {
prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ); prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);
......
...@@ -278,7 +278,7 @@ static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, stru ...@@ -278,7 +278,7 @@ static void __init sun4m_init_timers(irqreturn_t (*counter_fn)(int, void *, stru
irq = request_irq(TIMER_IRQ, irq = request_irq(TIMER_IRQ,
counter_fn, counter_fn,
(SA_INTERRUPT | SA_STATIC_ALLOC), (IRQF_DISABLED | SA_STATIC_ALLOC),
"timer", NULL); "timer", NULL);
if (irq) { if (irq) {
prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ); prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);
......
...@@ -74,7 +74,7 @@ void claim_ticker14(irqreturn_t (*handler)(int, void *, struct pt_regs *), ...@@ -74,7 +74,7 @@ void claim_ticker14(irqreturn_t (*handler)(int, void *, struct pt_regs *),
if (!request_irq(irq_nr, if (!request_irq(irq_nr,
handler, handler,
(SA_INTERRUPT | SA_STATIC_ALLOC), (IRQF_DISABLED | SA_STATIC_ALLOC),
"counter14", "counter14",
NULL)) { NULL)) {
install_linux_ticker(); install_linux_ticker();
......
...@@ -271,7 +271,8 @@ static int sun_fd_request_irq(void) ...@@ -271,7 +271,8 @@ static int sun_fd_request_irq(void)
if(!once) { if(!once) {
once = 1; once = 1;
error = request_fast_irq(FLOPPY_IRQ, floppy_hardint, SA_INTERRUPT, "floppy"); error = request_fast_irq(FLOPPY_IRQ, floppy_hardint,
IRQF_DISABLED, "floppy");
return ((error == 0) ? 0 : -1); return ((error == 0) ? 0 : -1);
} else return 0; } else return 0;
} }
......
...@@ -132,16 +132,13 @@ struct sigstack { ...@@ -132,16 +132,13 @@ struct sigstack {
* usage of signal stacks by using the (now obsolete) sa_restorer field in * 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 sigaction structure as a stack pointer. This is now possible due to
* the changes in signal handling. LBT 010493. * 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_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_NOCLDSTOP _SV_IGNCHILD
#define SA_STACK _SV_SSTACK #define SA_STACK _SV_SSTACK
#define SA_ONSTACK _SV_SSTACK #define SA_ONSTACK _SV_SSTACK
#define SA_RESTART _SV_INTR #define SA_RESTART _SV_INTR
#define SA_ONESHOT _SV_RESET #define SA_ONESHOT _SV_RESET
#define SA_INTERRUPT 0x10u
#define SA_NOMASK 0x20u #define SA_NOMASK 0x20u
#define SA_NOCLDWAIT 0x100u #define SA_NOCLDWAIT 0x100u
#define SA_SIGINFO 0x200u #define SA_SIGINFO 0x200u
......
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