diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:02:24 -0400 |
| commit | 343b0597297c3190647854881c087c01faf40a6f (patch) | |
| tree | 81cf818936bfd4aff891d1ca4d4ea4d47b2d1631 /kernel/timer.c | |
| parent | b2dabd5aadae6a93026f35269e1e53c1a0c6de2d (diff) | |
| parent | b2382b363df828f25e35ed8b70a3da33b29b2a64 (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index f2a11887a72..5377f40723f 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; |