---

yaml --- r: 277455 b: refs/heads/master c: 3596ff4 h: refs/heads/master i: 277453: c88391e 277451: c5ddd95 277447: b655c87 277439: 273101f v: v3
git-mirror · Dec 6, 2011 · 412af8c · 412af8c
1 parent f7f4811
commit 412af8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668b44846606185a9bed5a5357bc2cb132e00dd7
+refs/heads/master: 3596ff4e6b2aff8a28c69af389d5046090a53330
diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S
@@ -625,6 +625,8 @@ work_notifysig:				# deal with pending signals and
 	movl %esp, %eax
 	jne work_notifysig_v86		# returning to kernel-space or
 					# vm86-space
+	TRACE_IRQS_ON
+	ENABLE_INTERRUPTS(CLBR_NONE)
 	xorl %edx, %edx
 	call do_notify_resume
 	jmp resume_userspace_sig
@@ -638,6 +640,8 @@ work_notifysig_v86:
 #else
 	movl %esp, %eax
 #endif
+	TRACE_IRQS_ON
+	ENABLE_INTERRUPTS(CLBR_NONE)
 	xorl %edx, %edx
 	call do_notify_resume
 	jmp resume_userspace_sig