X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ftimer.c;h=5377f40723ff0dc37f13897847ea040f8c317292;hb=ef88b7dba2b47c70037a34a599d383462bb74bd3;hp=f2a11887a72680605bc9af158132a4fd104fbe24;hpb=8678887e7fb43cd6c9be6c9807b05e77848e0920;p=linux-2.6 diff --git a/kernel/timer.c b/kernel/timer.c index f2a11887a7..5377f40723 100644 --- a/kernel/timer.c +++ b/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;