diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
| commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
| tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /arch/m32r/kernel/irq.c | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
Merge branch 'master' into for-2.6.39
Diffstat (limited to 'arch/m32r/kernel/irq.c')
| -rw-r--r-- | arch/m32r/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c index f745c1287f3a..76eaf3883fbd 100644 --- a/arch/m32r/kernel/irq.c +++ b/arch/m32r/kernel/irq.c | |||
| @@ -80,7 +80,7 @@ asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs) | |||
| 80 | #ifdef CONFIG_DEBUG_STACKOVERFLOW | 80 | #ifdef CONFIG_DEBUG_STACKOVERFLOW |
| 81 | /* FIXME M32R */ | 81 | /* FIXME M32R */ |
| 82 | #endif | 82 | #endif |
| 83 | __do_IRQ(irq); | 83 | generic_handle_irq(irq); |
| 84 | irq_exit(); | 84 | irq_exit(); |
| 85 | set_irq_regs(old_regs); | 85 | set_irq_regs(old_regs); |
| 86 | 86 | ||