Commit 266f0566 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bbad0b66
...@@ -82,10 +82,6 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs) ...@@ -82,10 +82,6 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
} }
#endif #endif
if (!irq_desc[irq].handle_irq) {
__do_IRQ(irq, regs);
goto out_exit;
}
#ifdef CONFIG_4KSTACKS #ifdef CONFIG_4KSTACKS
curctx = (union irq_ctx *) current_thread_info(); curctx = (union irq_ctx *) current_thread_info();
...@@ -125,7 +121,6 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs) ...@@ -125,7 +121,6 @@ fastcall unsigned int do_IRQ(struct pt_regs *regs)
#endif #endif
__do_IRQ(irq, regs); __do_IRQ(irq, regs);
out_exit:
irq_exit(); irq_exit();
return 1; return 1;
......
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