From ccee33d37baea0a69fc4e18698ecfc26317bd813 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 6 Jun 2008 10:14:08 +0200
Subject: [PATCH] --- yaml --- r: 98038 b: refs/heads/master c:
 e32e58a96de4ac35a03349db2ab69f263ded958f h: refs/heads/master 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 062dbfceb0a9..1ef59991260e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52aaa12fbe786c90396f1b11ec39c924ccdd8fd5
+refs/heads/master: e32e58a96de4ac35a03349db2ab69f263ded958f
diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S
index 2a609dc3271c..c778e4fa55a2 100644
--- a/trunk/arch/x86/kernel/entry_32.S
+++ b/trunk/arch/x86/kernel/entry_32.S
@@ -248,6 +248,7 @@ ENTRY(resume_userspace)
  	DISABLE_INTERRUPTS(CLBR_ANY)	# make sure we don't miss an interrupt
 					# setting need_resched or sigpending
 					# between sampling and the iret
+	TRACE_IRQS_OFF
 	movl TI_flags(%ebp), %ecx
 	andl $_TIF_WORK_MASK, %ecx	# is there any work to be done on
 					# int/exception return?