39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
From 3ed87e07f7cd487e2783d64868aa5288987ba5ec Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Mon, 18 Jul 2011 15:59:38 +0200
|
|
Subject: [PATCH 065/286] x86-32-fix-signal-crap.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/x86/kernel/entry_32.S | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
|
|
index bcda816..426cf51 100644
|
|
--- a/arch/x86/kernel/entry_32.S
|
|
+++ b/arch/x86/kernel/entry_32.S
|
|
@@ -629,7 +629,11 @@ work_notifysig: # deal with pending signals and
|
|
jne work_notifysig_v86 # returning to kernel-space or
|
|
# vm86-space
|
|
xorl %edx, %edx
|
|
+ TRACE_IRQS_ON
|
|
+ ENABLE_INTERRUPTS(CLBR_NONE)
|
|
call do_notify_resume
|
|
+ DISABLE_INTERRUPTS(CLBR_ANY)
|
|
+ TRACE_IRQS_OFF
|
|
jmp resume_userspace_sig
|
|
|
|
ALIGN
|
|
@@ -642,7 +646,11 @@ work_notifysig_v86:
|
|
movl %esp, %eax
|
|
#endif
|
|
xorl %edx, %edx
|
|
+ TRACE_IRQS_ON
|
|
+ ENABLE_INTERRUPTS(CLBR_NONE)
|
|
call do_notify_resume
|
|
+ DISABLE_INTERRUPTS(CLBR_ANY)
|
|
+ TRACE_IRQS_OFF
|
|
jmp resume_userspace_sig
|
|
END(work_pending)
|
|
|