git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
sparc
/
kernel
/
irq.c
diff --git
a/arch/sparc/kernel/irq.c
b/arch/sparc/kernel/irq.c
index
72f0201
..
aac8af5
100644
(file)
--- a/
arch/sparc/kernel/irq.c
+++ b/
arch/sparc/kernel/irq.c
@@
-11,6
+11,7
@@
* Copyright (C) 1998-2000 Anton Blanchard (anton@samba.org)
*/
* Copyright (C) 1998-2000 Anton Blanchard (anton@samba.org)
*/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/ptrace.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/ptrace.h>
@@
-191,11
+192,11
@@
int show_interrupts(struct seq_file *p, void *v)
}
#endif
seq_printf(p, " %c %s",
}
#endif
seq_printf(p, " %c %s",
- (action->flags &
IRQF_DISABLED
) ? '+' : ' ',
+ (action->flags &
SA_INTERRUPT
) ? '+' : ' ',
action->name);
for (action=action->next; action; action = action->next) {
seq_printf(p, ",%s %s",
action->name);
for (action=action->next; action; action = action->next) {
seq_printf(p, ",%s %s",
- (action->flags &
IRQF_DISABLED
) ? " +" : "",
+ (action->flags &
SA_INTERRUPT
) ? " +" : "",
action->name);
}
seq_putc(p, '\n');
action->name);
}
seq_putc(p, '\n');
@@
-243,7
+244,7
@@
void free_irq(unsigned int irq, void *dev_id)
printk("Trying to free free shared IRQ%d\n",irq);
goto out_unlock;
}
printk("Trying to free free shared IRQ%d\n",irq);
goto out_unlock;
}
- } else if (action->flags &
IRQF_SHARED
) {
+ } else if (action->flags &
SA_SHIRQ
) {
printk("Trying to free shared IRQ%d with NULL device ID\n", irq);
goto out_unlock;
}
printk("Trying to free shared IRQ%d with NULL device ID\n", irq);
goto out_unlock;
}
@@
-329,7
+330,7
@@
void handler_irq(int irq, struct pt_regs * regs)
disable_pil_irq(irq);
#ifdef CONFIG_SMP
/* Only rotate on lower priority IRQ's (scsi, ethernet, etc.). */
disable_pil_irq(irq);
#ifdef CONFIG_SMP
/* Only rotate on lower priority IRQ's (scsi, ethernet, etc.). */
- if(
(sparc_cpu_model==sun4m) && (irq < 10)
)
+ if(
irq < 10
)
smp4m_irq_rotate(cpu);
#endif
action = sparc_irq[irq].action;
smp4m_irq_rotate(cpu);
#endif
action = sparc_irq[irq].action;
@@
-395,9
+396,9
@@
int request_fast_irq(unsigned int irq,
action = sparc_irq[cpu_irq].action;
if(action) {
action = sparc_irq[cpu_irq].action;
if(action) {
- if(action->flags &
IRQF_SHARED
)
+ if(action->flags &
SA_SHIRQ
)
panic("Trying to register fast irq when already shared.\n");
panic("Trying to register fast irq when already shared.\n");
- if(irqflags &
IRQF_SHARED
)
+ if(irqflags &
SA_SHIRQ
)
panic("Trying to register fast irq as shared.\n");
/* Anyway, someone already owns it so cannot be made fast. */
panic("Trying to register fast irq as shared.\n");
/* Anyway, someone already owns it so cannot be made fast. */
@@
-497,11
+498,11
@@
int request_irq(unsigned int irq,
actionp = &sparc_irq[cpu_irq].action;
action = *actionp;
if (action) {
actionp = &sparc_irq[cpu_irq].action;
action = *actionp;
if (action) {
- if (!(action->flags &
IRQF_SHARED) || !(irqflags & IRQF_SHARED
)) {
+ if (!(action->flags &
SA_SHIRQ) || !(irqflags & SA_SHIRQ
)) {
ret = -EBUSY;
goto out_unlock;
}
ret = -EBUSY;
goto out_unlock;
}
- if ((action->flags &
IRQF_DISABLED) != (irqflags & IRQF_DISABLED
)) {
+ if ((action->flags &
SA_INTERRUPT) != (irqflags & SA_INTERRUPT
)) {
printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);
ret = -EBUSY;
goto out_unlock;
printk("Attempt to mix fast and slow interrupts on IRQ%d denied\n", irq);
ret = -EBUSY;
goto out_unlock;