From 921faaba37312ddfc13c58fdbe8845b00a77a6ce Mon Sep 17 00:00:00 2001
From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Tue, 9 Sep 2008 21:56:14 +0200
Subject: [PATCH] --- yaml --- r: 113507 b: refs/heads/master c:
 85cea51d7e7b8d3408c8e933d88fa067309395fa h: refs/heads/master i:   113505:
 4c8a8297690b4b6d83d48b0ceff7f3db7cc30f01   113503:
 8db90b90adc399bde43afc406be1cbb0e705c775 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/entry_32.S | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1733ba84f7ce..5080a0ca6896 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8e0870f589cfa45575dc7333cdf1b8f769e7900
+refs/heads/master: 85cea51d7e7b8d3408c8e933d88fa067309395fa
diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S
index c5fe01bca6c0..49438e58291d 100644
--- a/trunk/arch/x86/kernel/entry_32.S
+++ b/trunk/arch/x86/kernel/entry_32.S
@@ -730,6 +730,7 @@ error_code:
 	movl $(__USER_DS), %ecx
 	movl %ecx, %ds
 	movl %ecx, %es
+	TRACE_IRQS_OFF
 	movl %esp,%eax			# pt_regs pointer
 	call *%edi
 	jmp ret_from_exception