From ae6900846c79ea5005326fa0a42ee32a3da20669 Mon Sep 17 00:00:00 2001
From: Mandeep Singh Baines <msb@chromium.org>
Date: Thu, 8 Dec 2011 14:34:44 -0800
Subject: [PATCH] --- yaml --- r: 276549 b: refs/heads/master c:
 031af165b1cd295ef04d2bfbcae9bc3cb9180735 h: refs/heads/master i:   276547:
 bc3bf38e6631b1da68318958266674b73bad4f6e v: v3

---
 [refs]               | 2 +-
 trunk/kernel/timer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;