aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAndrea Arcangeli <andrea@suse.de>2004-08-22 22:55:11 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-22 22:55:11 -0700
commit13ab6a2b43833fffed9d76203667b04c934f4cdc (patch)
treeeb7d3ac761c5cd92a9f27ac90702a28a8070c29a /arch
parent44d81093cd415933bdeda20d1424cef0e2bacead (diff)
downloadhistory-13ab6a2b43833fffed9d76203667b04c934f4cdc.tar.gz
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/traps.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index ae69bf846a4020..b27f36d3d69319 100644
--- 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;