Merge branch 'linus' into perfcounters/core-v2

[linux-drm-fsl-dcu.git] / kernel / sys.c

diff --git a/kernel/sys.c b/kernel/sys.c
index 7306f9421aac17ecc3ab7f614e8fdfd283fbcd5a..14c4c56131185937f1b624761a691d855479cf81 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -35,6 +35,7 @@
 #include <linux/seccomp.h>
 #include <linux/cpu.h>
 #include <linux/ptrace.h>
+#include <linux/fs_struct.h>
 
 #include <linux/compat.h>
 #include <linux/syscalls.h>
@@ -1014,10 +1015,8 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid)
        if (err)
                goto out;
 
-       if (task_pgrp(p) != pgrp) {
+       if (task_pgrp(p) != pgrp)
                change_pid(p, PIDTYPE_PGID, pgrp);
-               set_task_pgrp(p, pid_nr(pgrp));
-       }
 
        err = 0;
 out: