From 412af8cef8ec8a9fd83da88c5a4538b4b3e67b5b Mon Sep 17 00:00:00 2001 From: Srikar Dronamraju Date: Tue, 25 Oct 2011 19:48:12 +0530 Subject: [PATCH] --- yaml --- r: 277455 b: refs/heads/master c: 3596ff4e6b2aff8a28c69af389d5046090a53330 h: refs/heads/master i: 277453: c88391ebaf87dab19a94295d4740fd4ea8ebdb85 277451: c5ddd95c07ab79065d8d45ce81e6bea9bc0d56bd 277447: b655c879d4c41060c1e71e88d454b50cdc78b8af 277439: 273101f2ff90af0684fc86d5a7f3635627504a2e v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_32.S | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4f8a6169e0b2..22a0a98df2dc 100644 --- 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 index f3f6f5344001..22d0e21b4dd7 100644 --- 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