diff options
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 3a256957fb56..60aac2cea0cf 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | 3 | ||
| 4 | #include <linux/file.h> | 4 | #include <linux/file.h> |
| 5 | #include <linux/rcupdate.h> | 5 | #include <linux/rcupdate.h> |
| 6 | #include <linux/irqflags.h> | ||
| 7 | #include <linux/lockdep.h> | ||
| 6 | 8 | ||
| 7 | #define INIT_FDTABLE \ | 9 | #define INIT_FDTABLE \ |
| 8 | { \ | 10 | { \ |
| @@ -21,7 +23,7 @@ | |||
| 21 | .count = ATOMIC_INIT(1), \ | 23 | .count = ATOMIC_INIT(1), \ |
| 22 | .fdt = &init_files.fdtab, \ | 24 | .fdt = &init_files.fdtab, \ |
| 23 | .fdtab = INIT_FDTABLE, \ | 25 | .fdtab = INIT_FDTABLE, \ |
| 24 | .file_lock = SPIN_LOCK_UNLOCKED, \ | 26 | .file_lock = __SPIN_LOCK_UNLOCKED(init_task.file_lock), \ |
| 25 | .next_fd = 0, \ | 27 | .next_fd = 0, \ |
| 26 | .close_on_exec_init = { { 0, } }, \ | 28 | .close_on_exec_init = { { 0, } }, \ |
| 27 | .open_fds_init = { { 0, } }, \ | 29 | .open_fds_init = { { 0, } }, \ |
| @@ -36,7 +38,7 @@ | |||
| 36 | .user_id = 0, \ | 38 | .user_id = 0, \ |
| 37 | .next = NULL, \ | 39 | .next = NULL, \ |
| 38 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait), \ | 40 | .wait = __WAIT_QUEUE_HEAD_INITIALIZER(name.wait), \ |
| 39 | .ctx_lock = SPIN_LOCK_UNLOCKED, \ | 41 | .ctx_lock = __SPIN_LOCK_UNLOCKED(name.ctx_lock), \ |
| 40 | .reqs_active = 0U, \ | 42 | .reqs_active = 0U, \ |
| 41 | .max_reqs = ~0U, \ | 43 | .max_reqs = ~0U, \ |
| 42 | } | 44 | } |
| @@ -48,7 +50,7 @@ | |||
| 48 | .mm_users = ATOMIC_INIT(2), \ | 50 | .mm_users = ATOMIC_INIT(2), \ |
| 49 | .mm_count = ATOMIC_INIT(1), \ | 51 | .mm_count = ATOMIC_INIT(1), \ |
| 50 | .mmap_sem = __RWSEM_INITIALIZER(name.mmap_sem), \ | 52 | .mmap_sem = __RWSEM_INITIALIZER(name.mmap_sem), \ |
| 51 | .page_table_lock = SPIN_LOCK_UNLOCKED, \ | 53 | .page_table_lock = __SPIN_LOCK_UNLOCKED(name.page_table_lock), \ |
| 52 | .mmlist = LIST_HEAD_INIT(name.mmlist), \ | 54 | .mmlist = LIST_HEAD_INIT(name.mmlist), \ |
| 53 | .cpu_vm_mask = CPU_MASK_ALL, \ | 55 | .cpu_vm_mask = CPU_MASK_ALL, \ |
| 54 | } | 56 | } |
| @@ -69,7 +71,7 @@ | |||
| 69 | #define INIT_SIGHAND(sighand) { \ | 71 | #define INIT_SIGHAND(sighand) { \ |
| 70 | .count = ATOMIC_INIT(1), \ | 72 | .count = ATOMIC_INIT(1), \ |
| 71 | .action = { { { .sa_handler = NULL, } }, }, \ | 73 | .action = { { { .sa_handler = NULL, } }, }, \ |
| 72 | .siglock = SPIN_LOCK_UNLOCKED, \ | 74 | .siglock = __SPIN_LOCK_UNLOCKED(sighand.siglock), \ |
| 73 | } | 75 | } |
| 74 | 76 | ||
| 75 | extern struct group_info init_groups; | 77 | extern struct group_info init_groups; |
| @@ -119,12 +121,13 @@ extern struct group_info init_groups; | |||
| 119 | .list = LIST_HEAD_INIT(tsk.pending.list), \ | 121 | .list = LIST_HEAD_INIT(tsk.pending.list), \ |
| 120 | .signal = {{0}}}, \ | 122 | .signal = {{0}}}, \ |
| 121 | .blocked = {{0}}, \ | 123 | .blocked = {{0}}, \ |
| 122 | .alloc_lock = SPIN_LOCK_UNLOCKED, \ | 124 | .alloc_lock = __SPIN_LOCK_UNLOCKED(tsk.alloc_lock), \ |
| 123 | .journal_info = NULL, \ | 125 | .journal_info = NULL, \ |
| 124 | .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \ | 126 | .cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \ |
| 125 | .fs_excl = ATOMIC_INIT(0), \ | 127 | .fs_excl = ATOMIC_INIT(0), \ |
| 126 | .pi_lock = SPIN_LOCK_UNLOCKED, \ | 128 | .pi_lock = SPIN_LOCK_UNLOCKED, \ |
| 127 | INIT_RT_MUTEXES(tsk) \ | 129 | INIT_TRACE_IRQFLAGS \ |
| 130 | INIT_LOCKDEP \ | ||
| 128 | } | 131 | } |
| 129 | 132 | ||
| 130 | 133 | ||