Commit 4e0fadfc authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Linus Torvalds

[PATCH] IRQ: Fix AVR32 breakage

Make the necessary changes to AVR32 required by the irq regs stuff.
Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 41716c7c
...@@ -124,15 +124,15 @@ unsigned long long sched_clock(void) ...@@ -124,15 +124,15 @@ unsigned long long sched_clock(void)
* *
* In UP mode, it is invoked from the (global) timer_interrupt. * In UP mode, it is invoked from the (global) timer_interrupt.
*/ */
static void local_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) static void local_timer_interrupt(int irq, void *dev_id)
{ {
if (current->pid) if (current->pid)
profile_tick(CPU_PROFILING, regs); profile_tick(CPU_PROFILING);
update_process_times(user_mode(regs)); update_process_times(user_mode(get_irq_regs()));
} }
static irqreturn_t static irqreturn_t
timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) timer_interrupt(int irq, void *dev_id)
{ {
unsigned int count; unsigned int count;
...@@ -157,7 +157,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -157,7 +157,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
* *
* SMP is not supported yet. * SMP is not supported yet.
*/ */
local_timer_interrupt(irq, dev_id, regs); local_timer_interrupt(irq, dev_id);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
...@@ -102,8 +102,7 @@ struct irq_chip eim_chip = { ...@@ -102,8 +102,7 @@ struct irq_chip eim_chip = {
.set_type = eim_set_irq_type, .set_type = eim_set_irq_type,
}; };
static void demux_eim_irq(unsigned int irq, struct irq_desc *desc, static void demux_eim_irq(unsigned int irq, struct irq_desc *desc)
struct pt_regs *regs)
{ {
struct at32_sm *sm = desc->handler_data; struct at32_sm *sm = desc->handler_data;
struct irq_desc *ext_desc; struct irq_desc *ext_desc;
...@@ -121,7 +120,7 @@ static void demux_eim_irq(unsigned int irq, struct irq_desc *desc, ...@@ -121,7 +120,7 @@ static void demux_eim_irq(unsigned int irq, struct irq_desc *desc,
ext_irq = i + sm->eim_first_irq; ext_irq = i + sm->eim_first_irq;
ext_desc = irq_desc + ext_irq; ext_desc = irq_desc + ext_irq;
ext_desc->handle_irq(ext_irq, ext_desc, regs); ext_desc->handle_irq(ext_irq, ext_desc);
} }
spin_unlock(&sm->lock); spin_unlock(&sm->lock);
......
...@@ -52,16 +52,19 @@ static struct intc intc0 = { ...@@ -52,16 +52,19 @@ static struct intc intc0 = {
asmlinkage void do_IRQ(int level, struct pt_regs *regs) asmlinkage void do_IRQ(int level, struct pt_regs *regs)
{ {
struct irq_desc *desc; struct irq_desc *desc;
struct pt_regs *old_regs;
unsigned int irq; unsigned int irq;
unsigned long status_reg; unsigned long status_reg;
local_irq_disable(); local_irq_disable();
old_regs = set_irq_regs(regs);
irq_enter(); irq_enter();
irq = intc_readl(&intc0, INTCAUSE0 - 4 * level); irq = intc_readl(&intc0, INTCAUSE0 - 4 * level);
desc = irq_desc + irq; desc = irq_desc + irq;
desc->handle_irq(irq, desc, regs); desc->handle_irq(irq, desc);
/* /*
* Clear all interrupt level masks so that we may handle * Clear all interrupt level masks so that we may handle
...@@ -75,6 +78,8 @@ asmlinkage void do_IRQ(int level, struct pt_regs *regs) ...@@ -75,6 +78,8 @@ asmlinkage void do_IRQ(int level, struct pt_regs *regs)
sysreg_write(SR, status_reg); sysreg_write(SR, status_reg);
irq_exit(); irq_exit();
set_irq_regs(old_regs);
} }
void __init init_IRQ(void) void __init init_IRQ(void)
......
#include <asm-generic/irq_regs.h>
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