diff --git a/[refs] b/[refs]
index 3021e63ed6aa..158ad173355c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f024c1a4bc8ef9a149879351ce8b3aa749e0c2f
+refs/heads/master: 4c5640cb5f5a6fd780d99397eca028b575cb1206
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index f2a11887a726..5377f40723ff 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1023,7 +1023,7 @@ asmlinkage long sys_getppid(void)
 	parent = me->group_leader->real_parent;
 	for (;;) {
 		pid = parent->tgid;
-#ifdef CONFIG_SMP
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
 {
 		struct task_struct *old = parent;