diff --git a/[refs] b/[refs]
index 29db640cf971..9e2af7dadd73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cb6cbeaa9d6573c674842b9471c0467967aae99
+refs/heads/master: 950eaaca681c44aab87a46225c9e44f902c080aa
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index e9ad44489828..7f5a0cd296a9 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -931,6 +931,7 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid)
 		pgid = pid;
 	if (pgid < 0)
 		return -EINVAL;
+	rcu_read_lock();
 
 	/* From this point forward we keep holding onto the tasklist lock
 	 * so that our parent does not change from under us. -DaveM
@@ -984,6 +985,7 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid_t, pgid)
 out:
 	/* All paths lead to here, thus we are safe. -DaveM */
 	write_unlock_irq(&tasklist_lock);
+	rcu_read_unlock();
 	return err;
 }