summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/init_task.h2
-rw-r--r--include/linux/sched.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 803d8efb1c4a..714a678fc6c4 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -46,6 +46,7 @@
#define INIT_SIGNALS(sig) { \
.count = ATOMIC_INIT(1), \
+ .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\
.shared_pending = { \
.list = LIST_HEAD_INIT(sig.shared_pending.list), \
.signal = {{0}}}, \
@@ -88,7 +89,6 @@ extern struct group_info init_groups;
.children = LIST_HEAD_INIT(tsk.children), \
.sibling = LIST_HEAD_INIT(tsk.sibling), \
.group_leader = &tsk, \
- .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(tsk.wait_chldexit),\
.real_timer = { \
.function = it_real_fn \
}, \
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 3971c27b47e1..fe3e325923a1 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -274,6 +274,8 @@ struct signal_struct {
atomic_t count;
atomic_t live;
+ wait_queue_head_t wait_chldexit; /* for wait4() */
+
/* current thread group signal load-balancing target: */
task_t *curr_target;
@@ -586,7 +588,6 @@ struct task_struct {
/* PID/PID hash table linkage. */
struct pid pids[PIDTYPE_MAX];
- wait_queue_head_t wait_chldexit; /* for wait4() */
struct completion *vfork_done; /* for vfork() */
int __user *set_child_tid; /* CLONE_CHILD_SETTID */
int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */