[PATCH] do_general_protection doesn't disable irq

A trap gate shouldn't affect the irq status at all, so we don't need to
test whether the trapping code had interrupts enabled.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index ae69bf846a4020308101cc32e4d8e86b185b4d7f..b27f36d3d69319d505cb9843fd4dd38c02ad5b4e 100644 (file)
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -450,9 +450,6 @@ DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, get_cr
 
 asmlinkage void do_general_protection(struct pt_regs * regs, long error_code)
 {
-       if (regs->eflags & X86_EFLAGS_IF)
-               local_irq_enable();
- 
        if (regs->eflags & VM_MASK)
                goto gp_in_vm86;