diff options
author | Andi Kleen <ak@suse.de> | 2006-08-30 13:37:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-30 19:05:16 -0400 |
commit | 266f0566761cf88906d634727b3d9fc2556f5cbd (patch) | |
tree | a8f664a8b02e9363be200f80e0567dc2c6de74e3 /arch/i386 | |
parent | bbad0b669d33f3023cfe70ec79ba5ea487afca59 (diff) |
[PATCH] i386: Fix stack switching in do_IRQ
There was a bogus hunk from the genirq merge that essentially
broke stack switching for hard interrupts. Remove it since it isn't
needed.
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/irq.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/i386/kernel/irq.c b/arch/i386/kernel/irq.c index 6cb529f60dcc..5fe547cd8f9f 100644 --- a/arch/i386/kernel/irq.c +++ b/arch/i386/kernel/irq.c | |||
@@ -82,10 +82,6 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs) | |||
82 | } | 82 | } |
83 | #endif | 83 | #endif |
84 | 84 | ||
85 | if (!irq_desc[irq].handle_irq) { | ||
86 | __do_IRQ(irq, regs); | ||
87 | goto out_exit; | ||
88 | } | ||
89 | #ifdef CONFIG_4KSTACKS | 85 | #ifdef CONFIG_4KSTACKS |
90 | 86 | ||
91 | curctx = (union irq_ctx *) current_thread_info(); | 87 | curctx = (union irq_ctx *) current_thread_info(); |
@@ -125,7 +121,6 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs) | |||
125 | #endif | 121 | #endif |
126 | __do_IRQ(irq, regs); | 122 | __do_IRQ(irq, regs); |
127 | 123 | ||
128 | out_exit: | ||
129 | irq_exit(); | 124 | irq_exit(); |
130 | 125 | ||
131 | return 1; | 126 | return 1; |