From 09883ee0252434c7dbcbdddd17c468f07c014983 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Mon, 26 Jun 2006 00:26:06 -0700
Subject: [PATCH] --- yaml --- r: 30264 b: refs/heads/master c:
 281de339ceb822ca6c04d4373ecb9a45c1890ce4 h: refs/heads/master v: v3

---
 [refs]          | 2 +-
 trunk/fs/exec.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 718198d02185..2c6d83e9b2f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aceecc041217b35df753d1ed6e25bd17c0c558d8
+refs/heads/master: 281de339ceb822ca6c04d4373ecb9a45c1890ce4
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index 80fe7bcfa094..a5c51646d1ad 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -1371,17 +1371,24 @@ static void format_corename(char *corename, const char *pattern, long signr)
 static void zap_process(struct task_struct *start, int *ptraced)
 {
 	struct task_struct *t;
+	unsigned long flags;
+
+	spin_lock_irqsave(&start->sighand->siglock, flags);
 
 	t = start;
 	do {
 		if (t != current && t->mm) {
 			t->mm->core_waiters++;
-			force_sig_specific(SIGKILL, t);
+			sigaddset(&t->pending.signal, SIGKILL);
+			signal_wake_up(t, 1);
+
 			if (unlikely(t->ptrace) &&
 			    unlikely(t->parent->mm == t->mm))
 				*ptraced = 1;
 		}
 	} while ((t = next_thread(t)) != start);
+
+	spin_unlock_irqrestore(&start->sighand->siglock, flags);
 }
 
 static void zap_threads (struct mm_struct *mm)