[S390] gettimeofday.S: removed duplicated #includes

[linux-2.6-omap-h63xx.git] / kernel / signal.c

diff --git a/kernel/signal.c b/kernel/signal.c
index 2a64304ed54b041c327f64910f0cf84ee5a64e2f..3152ac3b62e254390a39439a98ed53402d4ed6c1 100644 (file)
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -41,6 +41,8 @@
 
 static struct kmem_cache *sigqueue_cachep;
 
+DEFINE_TRACE(sched_signal_send);
+
 static void __user *sig_handler(struct task_struct *t, int sig)
 {
        return t->sighand->action[sig - 1].sa.sa_handler;
@@ -856,7 +858,8 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
                        q->info.si_signo = sig;
                        q->info.si_errno = 0;
                        q->info.si_code = SI_USER;
-                       q->info.si_pid = task_pid_vnr(current);
+                       q->info.si_pid = task_tgid_nr_ns(current,
+                                                       task_active_pid_ns(t));
                        q->info.si_uid = current_uid();
                        break;
                case (unsigned long) SEND_SIG_PRIV: