diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch) | |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /kernel/timer.c | |
| parent | 8531c5ffbca65f6df868637c26e6df6f88bff738 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
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 f2a11887a726..5377f40723ff 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -1023,7 +1023,7 @@ asmlinkage long sys_getppid(void) | |||
| 1023 | parent = me->group_leader->real_parent; | 1023 | parent = me->group_leader->real_parent; |
| 1024 | for (;;) { | 1024 | for (;;) { |
| 1025 | pid = parent->tgid; | 1025 | pid = parent->tgid; |
| 1026 | #ifdef CONFIG_SMP | 1026 | #if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT) |
| 1027 | { | 1027 | { |
| 1028 | struct task_struct *old = parent; | 1028 | struct task_struct *old = parent; |
| 1029 | 1029 | ||