---

yaml --- r: 5933 b: refs/heads/master c: 4c5640c h: refs/heads/master i: 5931: 349f822 v: v3
git-mirror · Aug 23, 2005 · b6050dd · b6050dd
1 parent 5b64a0d
commit b6050dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;