mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
sparc: in handler_irq() rename irq parameter to pil
The generic irq support uses "irq" to identify the virtual irq number. To avoid confusion rename the argument to handler_irq() to pil to match the name of the parameter in the PCR register. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9f2264aca0
commit
d4d1ec48c4
3 changed files with 21 additions and 21 deletions
|
@ -320,7 +320,7 @@ void unexpected_irq(int irq, void *dev_id, struct pt_regs * regs)
|
||||||
panic("bogus interrupt received");
|
panic("bogus interrupt received");
|
||||||
}
|
}
|
||||||
|
|
||||||
void handler_irq(int irq, struct pt_regs * regs)
|
void handler_irq(int pil, struct pt_regs * regs)
|
||||||
{
|
{
|
||||||
struct pt_regs *old_regs;
|
struct pt_regs *old_regs;
|
||||||
struct irqaction * action;
|
struct irqaction * action;
|
||||||
|
@ -331,23 +331,23 @@ void handler_irq(int irq, struct pt_regs * regs)
|
||||||
|
|
||||||
old_regs = set_irq_regs(regs);
|
old_regs = set_irq_regs(regs);
|
||||||
irq_enter();
|
irq_enter();
|
||||||
disable_pil_irq(irq);
|
disable_pil_irq(pil);
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
/* Only rotate on lower priority IRQs (scsi, ethernet, etc.). */
|
/* Only rotate on lower priority IRQs (scsi, ethernet, etc.). */
|
||||||
if((sparc_cpu_model==sun4m) && (irq < 10))
|
if((sparc_cpu_model==sun4m) && (pil < 10))
|
||||||
smp4m_irq_rotate(cpu);
|
smp4m_irq_rotate(cpu);
|
||||||
#endif
|
#endif
|
||||||
action = sparc_irq[irq].action;
|
action = sparc_irq[pil].action;
|
||||||
sparc_irq[irq].flags |= SPARC_IRQ_INPROGRESS;
|
sparc_irq[pil].flags |= SPARC_IRQ_INPROGRESS;
|
||||||
kstat_cpu(cpu).irqs[irq]++;
|
kstat_cpu(cpu).irqs[pil]++;
|
||||||
do {
|
do {
|
||||||
if (!action || !action->handler)
|
if (!action || !action->handler)
|
||||||
unexpected_irq(irq, NULL, regs);
|
unexpected_irq(pil, NULL, regs);
|
||||||
action->handler(irq, action->dev_id);
|
action->handler(pil, action->dev_id);
|
||||||
action = action->next;
|
action = action->next;
|
||||||
} while (action);
|
} while (action);
|
||||||
sparc_irq[irq].flags &= ~SPARC_IRQ_INPROGRESS;
|
sparc_irq[pil].flags &= ~SPARC_IRQ_INPROGRESS;
|
||||||
enable_pil_irq(irq);
|
enable_pil_irq(pil);
|
||||||
irq_exit();
|
irq_exit();
|
||||||
set_irq_regs(old_regs);
|
set_irq_regs(old_regs);
|
||||||
}
|
}
|
||||||
|
|
|
@ -714,13 +714,13 @@ void ack_bad_irq(unsigned int virt_irq)
|
||||||
void *hardirq_stack[NR_CPUS];
|
void *hardirq_stack[NR_CPUS];
|
||||||
void *softirq_stack[NR_CPUS];
|
void *softirq_stack[NR_CPUS];
|
||||||
|
|
||||||
void __irq_entry handler_irq(int irq, struct pt_regs *regs)
|
void __irq_entry handler_irq(int pil, struct pt_regs *regs)
|
||||||
{
|
{
|
||||||
unsigned long pstate, bucket_pa;
|
unsigned long pstate, bucket_pa;
|
||||||
struct pt_regs *old_regs;
|
struct pt_regs *old_regs;
|
||||||
void *orig_sp;
|
void *orig_sp;
|
||||||
|
|
||||||
clear_softint(1 << irq);
|
clear_softint(1 << pil);
|
||||||
|
|
||||||
old_regs = set_irq_regs(regs);
|
old_regs = set_irq_regs(regs);
|
||||||
irq_enter();
|
irq_enter();
|
||||||
|
|
|
@ -205,28 +205,28 @@ void sun4d_free_irq(unsigned int irq, void *dev_id)
|
||||||
|
|
||||||
extern void unexpected_irq(int, void *, struct pt_regs *);
|
extern void unexpected_irq(int, void *, struct pt_regs *);
|
||||||
|
|
||||||
void sun4d_handler_irq(int irq, struct pt_regs * regs)
|
void sun4d_handler_irq(int pil, struct pt_regs * regs)
|
||||||
{
|
{
|
||||||
struct pt_regs *old_regs;
|
struct pt_regs *old_regs;
|
||||||
struct irqaction * action;
|
struct irqaction * action;
|
||||||
int cpu = smp_processor_id();
|
int cpu = smp_processor_id();
|
||||||
/* SBUS IRQ level (1 - 7) */
|
/* SBUS IRQ level (1 - 7) */
|
||||||
int sbusl = pil_to_sbus[irq];
|
int sbusl = pil_to_sbus[pil];
|
||||||
|
|
||||||
/* FIXME: Is this necessary?? */
|
/* FIXME: Is this necessary?? */
|
||||||
cc_get_ipen();
|
cc_get_ipen();
|
||||||
|
|
||||||
cc_set_iclr(1 << irq);
|
cc_set_iclr(1 << pil);
|
||||||
|
|
||||||
old_regs = set_irq_regs(regs);
|
old_regs = set_irq_regs(regs);
|
||||||
irq_enter();
|
irq_enter();
|
||||||
kstat_cpu(cpu).irqs[irq]++;
|
kstat_cpu(cpu).irqs[pil]++;
|
||||||
if (!sbusl) {
|
if (!sbusl) {
|
||||||
action = *(irq + irq_action);
|
action = *(pil + irq_action);
|
||||||
if (!action)
|
if (!action)
|
||||||
unexpected_irq(irq, NULL, regs);
|
unexpected_irq(pil, NULL, regs);
|
||||||
do {
|
do {
|
||||||
action->handler(irq, action->dev_id);
|
action->handler(pil, action->dev_id);
|
||||||
action = action->next;
|
action = action->next;
|
||||||
} while (action);
|
} while (action);
|
||||||
} else {
|
} else {
|
||||||
|
@ -251,9 +251,9 @@ void sun4d_handler_irq(int irq, struct pt_regs * regs)
|
||||||
action = actionp->action;
|
action = actionp->action;
|
||||||
|
|
||||||
if (!action)
|
if (!action)
|
||||||
unexpected_irq(irq, NULL, regs);
|
unexpected_irq(pil, NULL, regs);
|
||||||
do {
|
do {
|
||||||
action->handler(irq, action->dev_id);
|
action->handler(pil, action->dev_id);
|
||||||
action = action->next;
|
action = action->next;
|
||||||
} while (action);
|
} while (action);
|
||||||
release_sbi(SBI2DEVID(sbino), slot);
|
release_sbi(SBI2DEVID(sbino), slot);
|
||||||
|
|
Loading…
Reference in a new issue