diff --git a/[refs] b/[refs] index 54ce8af8242a..4ccf9a020a09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a54aebf6978e9f296a4d3da3e40af425163c22e +refs/heads/master: abd63bc3a0f65ae9d85bc3b1bb067d3e3c2b2cc2 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index cc8c6206657f..5ef09012a629 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1330,8 +1330,8 @@ struct task_struct { * older sibling, respectively. (p->father can be replaced with * p->real_parent->pid) */ - struct task_struct *real_parent; /* real parent process */ - struct task_struct *parent; /* recipient of SIGCHLD, wait4() reports */ + struct task_struct __rcu *real_parent; /* real parent process */ + struct task_struct __rcu *parent; /* recipient of SIGCHLD, wait4() reports */ /* * children/sibling forms the list of my natural children */