From 08fddf5c2a790520c9f58e01b807de19311a1a9b Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Mon, 17 Mar 2008 02:21:08 -0700
Subject: [PATCH] --- yaml --- r: 88880 b: refs/heads/master c:
 0f54091051c450bab751c3ca0cb45d61a67a683b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/vm86_32.c | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 703bf4e7db95..5ed450fa3805 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b00de174e3d52d9185e2e9937a6a2704c9d7d520
+refs/heads/master: 0f54091051c450bab751c3ca0cb45d61a67a683b
diff --git a/trunk/arch/x86/kernel/vm86_32.c b/trunk/arch/x86/kernel/vm86_32.c
index 6a91fcf92d67..51040698c222 100644
--- a/trunk/arch/x86/kernel/vm86_32.c
+++ b/trunk/arch/x86/kernel/vm86_32.c
@@ -557,16 +557,9 @@ int handle_vm86_trap(struct kernel_vm86_regs *regs, long error_code, int trapno)
 	}
 	if (trapno != 1)
 		return 1; /* we let this handle by the calling routine */
-	if (current->ptrace & PT_PTRACED) {
-		unsigned long flags;
-		spin_lock_irqsave(&current->sighand->siglock, flags);
-		sigdelset(&current->blocked, SIGTRAP);
-		recalc_sigpending();
-		spin_unlock_irqrestore(&current->sighand->siglock, flags);
-	}
-	send_sig(SIGTRAP, current, 1);
 	current->thread.trap_no = trapno;
 	current->thread.error_code = error_code;
+	force_sig(SIGTRAP, current);
 	return 0;
 }