git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
irq.c
diff --git
a/arch/m32r/kernel/irq.c
b/arch/m32r/kernel/irq.c
index
3841861
..
f8d8650
100644
(file)
--- a/
arch/m32r/kernel/irq.c
+++ b/
arch/m32r/kernel/irq.c
@@
-77,13
+77,16
@@
skip:
*/
asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
{
*/
asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
{
+ struct pt_regs *old_regs;
+ old_regs = set_irq_regs(regs);
irq_enter();
#ifdef CONFIG_DEBUG_STACKOVERFLOW
/* FIXME M32R */
#endif
irq_enter();
#ifdef CONFIG_DEBUG_STACKOVERFLOW
/* FIXME M32R */
#endif
- __do_IRQ(irq
, regs
);
+ __do_IRQ(irq);
irq_exit();
irq_exit();
+ set_irq_regs(old_regs);
return 1;
}
return 1;
}