2.6.24-git20

 ipc

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 6ca7b97..60f7a27 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -332,8 +332,7 @@ static ssize_t mqueue_read_file(struct file *filp, char __user *u_data,
          (info->notify_owner &&
           info->notify.sigev_notify == SIGEV_SIGNAL) ?
             info->notify.sigev_signo : 0,
-         pid_nr_ns(info->notify_owner,
-            current->nsproxy->pid_ns));
+         pid_vnr(info->notify_owner));
    spin_unlock(&info->lock);
    buffer[sizeof(buffer)-1] = '\0';
    slen = strlen(buffer)+1;
@@ -510,7 +509,7 @@ static void __do_notify(struct mqueue_inode_info *info)
          sig_i.si_errno = 0;
          sig_i.si_code = SI_MESGQ;
          sig_i.si_value = info->notify.sigev_value;
-         sig_i.si_pid = task_pid_vnr(current);
+         sig_i.si_pid = task_tgid_vnr(current);
          sig_i.si_uid = current->uid;
 
          kill_pid_info(info->notify.sigev_signo,