diff --git a/[refs] b/[refs] index a6df59571370..4549915ed362 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1cee22b7f385b6c4f716846203a96e1f302132aa +refs/heads/master: 031af165b1cd295ef04d2bfbcae9bc3cb9180735 diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c index dbaa62422b13..9c3c62b0c4bc 100644 --- a/trunk/kernel/timer.c +++ b/trunk/kernel/timer.c @@ -1368,7 +1368,7 @@ SYSCALL_DEFINE0(getppid) int pid; rcu_read_lock(); - pid = task_tgid_vnr(current->real_parent); + pid = task_tgid_vnr(rcu_dereference(current->real_parent)); rcu_read_unlock(); return pid;