From d4d1ec48c4b1568338931bf8e7833543b78ec9d5 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sat, 22 Jan 2011 11:32:15 +0000 Subject: 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 Cc: Thomas Gleixner Signed-off-by: David S. Miller --- arch/sparc/kernel/irq_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/sparc/kernel/irq_64.c') diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index ee67dae079c6..d4d1233d4ec4 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c @@ -714,13 +714,13 @@ void ack_bad_irq(unsigned int virt_irq) void *hardirq_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; struct pt_regs *old_regs; void *orig_sp; - clear_softint(1 << irq); + clear_softint(1 << pil); old_regs = set_irq_regs(regs); irq_enter(); -- cgit v1.2.3-58-ga151