From eaf7b8641bbe937d5982ac5ac382ca09778f3f12 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Thu, 2 Apr 2009 16:58:02 -0700
Subject: [PATCH] --- yaml --- r: 139681 b: refs/heads/master c:
 f008faff0e2777c8b3fe853891b774ca465938d8 h: refs/heads/master i:   139679:
 f03449f8829a218e9518fb455d0e5305aa1784a5 v: v3

---
 [refs]                |  2 +-
 trunk/kernel/signal.c | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f4adf24da0d8..7f73547b9c3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43918f2bf4806675943416d539d9d5e4d585ebff
+refs/heads/master: f008faff0e2777c8b3fe853891b774ca465938d8
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 92a1ab004498..8bf7a40e5c71 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -55,10 +55,21 @@ static int sig_handler_ignored(void __user *handler, int sig)
 		(handler == SIG_DFL && sig_kernel_ignore(sig));
 }
 
-static int sig_ignored(struct task_struct *t, int sig)
+static int sig_task_ignored(struct task_struct *t, int sig)
 {
 	void __user *handler;
 
+	handler = sig_handler(t, sig);
+
+	if (unlikely(t->signal->flags & SIGNAL_UNKILLABLE) &&
+			handler == SIG_DFL)
+		return 1;
+
+	return sig_handler_ignored(handler, sig);
+}
+
+static int sig_ignored(struct task_struct *t, int sig)
+{
 	/*
 	 * Blocked signals are never ignored, since the
 	 * signal handler may change by the time it is
@@ -67,8 +78,7 @@ static int sig_ignored(struct task_struct *t, int sig)
 	if (sigismember(&t->blocked, sig) || sigismember(&t->real_blocked, sig))
 		return 0;
 
-	handler = sig_handler(t, sig);
-	if (!sig_handler_ignored(handler, sig))
+	if (!sig_task_ignored(t, sig))
 		return 0;
 
 	/*