---

yaml --- r: 98038 b: refs/heads/master c: e32e58a h: refs/heads/master v: v3
git-mirror · Jun 12, 2008 · ccee33d · ccee33d
1 parent 2163f6f
commit ccee33d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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?