git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
kernel
/
timer.c
diff --git
a/kernel/timer.c
b/kernel/timer.c
index
a9d5871
..
633e5df
100644
(file)
--- a/
kernel/timer.c
+++ b/
kernel/timer.c
@@
-1320,9
+1320,9
@@
asmlinkage long sys_getpid(void)
}
/*
}
/*
- * Accessing ->parent is not SMP-safe, it could
+ * Accessing ->
real_
parent is not SMP-safe, it could
* change from under us. However, we can use a stale
* change from under us. However, we can use a stale
- * value of ->parent under rcu_read_lock(), see
+ * value of ->
real_
parent under rcu_read_lock(), see
* release_task()->call_rcu(delayed_put_task_struct).
*/
asmlinkage long sys_getppid(void)
* release_task()->call_rcu(delayed_put_task_struct).
*/
asmlinkage long sys_getppid(void)
@@
-1330,7
+1330,7
@@
asmlinkage long sys_getppid(void)
int pid;
rcu_read_lock();
int pid;
rcu_read_lock();
- pid = rcu_dereference(current->parent)->tgid;
+ pid = rcu_dereference(current->
real_
parent)->tgid;
rcu_read_unlock();
return vx_map_pid(pid);
}
rcu_read_unlock();
return vx_map_pid(pid);
}