From 47733fa934ca608aba1a52a6a17c590646b1e4b0 Mon Sep 17 00:00:00 2001
From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Date: Thu, 2 Apr 2009 16:58:09 -0700
Subject: [PATCH] --- yaml --- r: 139686 b: refs/heads/master c:
 6588c1e3ff01418acafd938db0740e3477dc8cb7 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/kernel/signal.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 81f56164abf4..ec92f6a61443 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3bfa0cba867f23365b81658b47efd906830879b
+refs/heads/master: 6588c1e3ff01418acafd938db0740e3477dc8cb7
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index ba3da25f0eea..d8034737db4c 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -883,6 +883,8 @@ static int __send_signal(int sig, struct siginfo *info, struct task_struct *t,
 			break;
 		default:
 			copy_siginfo(&q->info, info);
+			if (from_ancestor_ns)
+				q->info.si_pid = 0;
 			break;
 		}
 	} else if (!is_si_special(info)) {