diff options
Diffstat (limited to 'include/linux/init_task.h')
-rw-r--r-- | include/linux/init_task.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index e38681f4912d..1c1ff7e4faa4 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
@@ -25,13 +25,6 @@ | |||
25 | extern struct files_struct init_files; | 25 | extern struct files_struct init_files; |
26 | extern struct fs_struct init_fs; | 26 | extern struct fs_struct init_fs; |
27 | 27 | ||
28 | #ifdef CONFIG_CGROUPS | ||
29 | #define INIT_GROUP_RWSEM(sig) \ | ||
30 | .group_rwsem = __RWSEM_INITIALIZER(sig.group_rwsem), | ||
31 | #else | ||
32 | #define INIT_GROUP_RWSEM(sig) | ||
33 | #endif | ||
34 | |||
35 | #ifdef CONFIG_CPUSETS | 28 | #ifdef CONFIG_CPUSETS |
36 | #define INIT_CPUSET_SEQ(tsk) \ | 29 | #define INIT_CPUSET_SEQ(tsk) \ |
37 | .mems_allowed_seq = SEQCNT_ZERO(tsk.mems_allowed_seq), | 30 | .mems_allowed_seq = SEQCNT_ZERO(tsk.mems_allowed_seq), |
@@ -59,12 +52,12 @@ extern struct fs_struct init_fs; | |||
59 | .rlim = INIT_RLIMITS, \ | 52 | .rlim = INIT_RLIMITS, \ |
60 | .cputimer = { \ | 53 | .cputimer = { \ |
61 | .cputime_atomic = INIT_CPUTIME_ATOMIC, \ | 54 | .cputime_atomic = INIT_CPUTIME_ATOMIC, \ |
62 | .running = 0, \ | 55 | .running = false, \ |
56 | .checking_timer = false, \ | ||
63 | }, \ | 57 | }, \ |
64 | INIT_PREV_CPUTIME(sig) \ | 58 | INIT_PREV_CPUTIME(sig) \ |
65 | .cred_guard_mutex = \ | 59 | .cred_guard_mutex = \ |
66 | __MUTEX_INITIALIZER(sig.cred_guard_mutex), \ | 60 | __MUTEX_INITIALIZER(sig.cred_guard_mutex), \ |
67 | INIT_GROUP_RWSEM(sig) \ | ||
68 | } | 61 | } |
69 | 62 | ||
70 | extern struct nsproxy init_nsproxy; | 63 | extern struct nsproxy init_nsproxy; |