From c50de3e38be8917cc3816251f36e891aba046f03 Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 27 Oct 2010 15:34:06 -0700
Subject: [PATCH] --- yaml --- r: 218561 b: refs/heads/master c:
 b8ed374e202e23caaf9bd77dcadc9de6447faaa8 h: refs/heads/master i:   218559:
 d808516a39d5efbd6e0510e9bb1deb60090f20e5 v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 9 ++++++++-
 trunk/kernel/signal.c       | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9bc2a2dd42cf..2b32cd3918e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ef45079dd9c8f2e9c7aa788dc3121835ae52863
+refs/heads/master: b8ed374e202e23caaf9bd77dcadc9de6447faaa8
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 393ce94e54b7..3ff5c8519abd 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -2236,9 +2236,16 @@ static inline void task_unlock(struct task_struct *p)
 	spin_unlock(&p->alloc_lock);
 }
 
-extern struct sighand_struct *lock_task_sighand(struct task_struct *tsk,
+extern struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
 							unsigned long *flags);
 
+#define lock_task_sighand(tsk, flags)					\
+({	struct sighand_struct *__ss;					\
+	__cond_lock(&(tsk)->sighand->siglock,				\
+		    (__ss = __lock_task_sighand(tsk, flags)));		\
+	__ss;								\
+})									\
+
 static inline void unlock_task_sighand(struct task_struct *tsk,
 						unsigned long *flags)
 {
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index 919562c3d6b7..e921409b85a9 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -1105,7 +1105,8 @@ int zap_other_threads(struct task_struct *p)
 	return count;
 }
 
-struct sighand_struct *lock_task_sighand(struct task_struct *tsk, unsigned long *flags)
+struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
+					   unsigned long *flags)
 {
 	struct sighand_struct *sighand;