X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fsignal.c;h=4e3cff10fdceda165e8e9f22c0e9b861dba918d8;hb=162164f7e92da970666e7492fd58644f3c1f8574;hp=919562c3d6b720d58ff246b2c412114d77c0b419;hpb=5df414c61e1b6f15bdc3759f292c7404286c9827;p=~andy%2Flinux

diff --git a/kernel/signal.c b/kernel/signal.c
index 919562c3d6b..4e3cff10fdc 100644
--- a/kernel/signal.c
+++ b/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;
 
@@ -1617,6 +1618,8 @@ static int sigkill_pending(struct task_struct *tsk)
  * is gone, we keep current->exit_code unless clear_code.
  */
 static void ptrace_stop(int exit_code, int clear_code, siginfo_t *info)
+	__releases(&current->sighand->siglock)
+	__acquires(&current->sighand->siglock)
 {
 	if (arch_ptrace_stop_needed(exit_code, info)) {
 		/*