diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 16:11:15 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 16:11:15 -0400 |
commit | e630015504cdd4d166c371fec39b8ca258fcbc0e (patch) | |
tree | dc9eccdf841b86099f4fa6e14711058f3ddcf573 /arch | |
parent | e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 (diff) |
ARM: fix up nested irq regs usage
This should fix up the per-cpu irq register pointer if we have nested
hardware interrupts.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kernel/irq.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index e999b11de2c6..2c4ff1cbe334 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
@@ -111,6 +111,7 @@ static struct irq_desc bad_irq_desc = { | |||
111 | */ | 111 | */ |
112 | asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) | 112 | asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) |
113 | { | 113 | { |
114 | struct pt_regs *old_regs = set_irq_regs(regs); | ||
114 | struct irqdesc *desc = irq_desc + irq; | 115 | struct irqdesc *desc = irq_desc + irq; |
115 | 116 | ||
116 | /* | 117 | /* |
@@ -122,13 +123,13 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) | |||
122 | 123 | ||
123 | irq_enter(); | 124 | irq_enter(); |
124 | 125 | ||
125 | set_irq_regs(regs); | ||
126 | desc_handle_irq(irq, desc); | 126 | desc_handle_irq(irq, desc); |
127 | 127 | ||
128 | /* AT91 specific workaround */ | 128 | /* AT91 specific workaround */ |
129 | irq_finish(irq); | 129 | irq_finish(irq); |
130 | 130 | ||
131 | irq_exit(); | 131 | irq_exit(); |
132 | set_irq_regs(old_regs); | ||
132 | } | 133 | } |
133 | 134 | ||
134 | void set_irq_flags(unsigned int irq, unsigned int iflags) | 135 | void set_irq_flags(unsigned int irq, unsigned int iflags) |