diff options
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index f00253b3fc47..1f43fa56f600 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -16,7 +16,7 @@ extern struct files_struct init_files; | |||
| 16 | extern struct fs_struct init_fs; | 16 | extern struct fs_struct init_fs; |
| 17 | 17 | ||
| 18 | #define INIT_SIGNALS(sig) { \ | 18 | #define INIT_SIGNALS(sig) { \ |
| 19 | .count = ATOMIC_INIT(1), \ | 19 | .nr_threads = 1, \ |
| 20 | .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\ | 20 | .wait_chldexit = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\ |
| 21 | .shared_pending = { \ | 21 | .shared_pending = { \ |
| 22 | .list = LIST_HEAD_INIT(sig.shared_pending.list), \ | 22 | .list = LIST_HEAD_INIT(sig.shared_pending.list), \ |
| @@ -32,18 +32,10 @@ extern struct fs_struct init_fs; | |||
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | extern struct nsproxy init_nsproxy; | 34 | extern struct nsproxy init_nsproxy; |
| 35 | #define INIT_NSPROXY(nsproxy) { \ | ||
| 36 | .pid_ns = &init_pid_ns, \ | ||
| 37 | .count = ATOMIC_INIT(1), \ | ||
| 38 | .uts_ns = &init_uts_ns, \ | ||
| 39 | .mnt_ns = NULL, \ | ||
| 40 | INIT_NET_NS(net_ns) \ | ||
| 41 | INIT_IPC_NS(ipc_ns) \ | ||
| 42 | } | ||
| 43 | 35 | ||
| 44 | #define INIT_SIGHAND(sighand) { \ | 36 | #define INIT_SIGHAND(sighand) { \ |
| 45 | .count = ATOMIC_INIT(1), \ | 37 | .count = ATOMIC_INIT(1), \ |
| 46 | .action = { { { .sa_handler = NULL, } }, }, \ | 38 | .action = { { { .sa_handler = SIG_DFL, } }, }, \ |
| 47 | .siglock = __SPIN_LOCK_UNLOCKED(sighand.siglock), \ | 39 | .siglock = __SPIN_LOCK_UNLOCKED(sighand.siglock), \ |
| 48 | .signalfd_wqh = __WAIT_QUEUE_HEAD_INITIALIZER(sighand.signalfd_wqh), \ | 40 | .signalfd_wqh = __WAIT_QUEUE_HEAD_INITIALIZER(sighand.signalfd_wqh), \ |
| 49 | } | 41 | } |
| @@ -53,11 +45,10 @@ extern struct group_info init_groups; | |||
| 53 | #define INIT_STRUCT_PID { \ | 45 | #define INIT_STRUCT_PID { \ |
| 54 | .count = ATOMIC_INIT(1), \ | 46 | .count = ATOMIC_INIT(1), \ |
| 55 | .tasks = { \ | 47 | .tasks = { \ |
| 56 | { .first = &init_task.pids[PIDTYPE_PID].node }, \ | 48 | { .first = NULL }, \ |
| 57 | { .first = &init_task.pids[PIDTYPE_PGID].node }, \ | 49 | { .first = NULL }, \ |
| 58 | { .first = &init_task.pids[PIDTYPE_SID].node }, \ | 50 | { .first = NULL }, \ |
| 59 | }, \ | 51 | }, \ |
| 60 | .rcu = RCU_HEAD_INIT, \ | ||
| 61 | .level = 0, \ | 52 | .level = 0, \ |
| 62 | .numbers = { { \ | 53 | .numbers = { { \ |
| 63 | .nr = 0, \ | 54 | .nr = 0, \ |
| @@ -70,7 +61,7 @@ extern struct group_info init_groups; | |||
| 70 | { \ | 61 | { \ |
| 71 | .node = { \ | 62 | .node = { \ |
| 72 | .next = NULL, \ | 63 | .next = NULL, \ |
| 73 | .pprev = &init_struct_pid.tasks[type].first, \ | 64 | .pprev = NULL, \ |
| 74 | }, \ | 65 | }, \ |
| 75 | .pid = &init_struct_pid, \ | 66 | .pid = &init_struct_pid, \ |
| 76 | } | 67 | } |
| @@ -172,6 +163,7 @@ extern struct cred init_cred; | |||
| 172 | [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \ | 163 | [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \ |
| 173 | [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \ | 164 | [PIDTYPE_SID] = INIT_PID_LINK(PIDTYPE_SID), \ |
| 174 | }, \ | 165 | }, \ |
| 166 | .thread_group = LIST_HEAD_INIT(tsk.thread_group), \ | ||
| 175 | .dirties = INIT_PROP_LOCAL_SINGLE(dirties), \ | 167 | .dirties = INIT_PROP_LOCAL_SINGLE(dirties), \ |
| 176 | INIT_IDS \ | 168 | INIT_IDS \ |
| 177 | INIT_PERF_EVENTS(tsk) \ | 169 | INIT_PERF_EVENTS(tsk) \ |