aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/init_task.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-29 03:45:15 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-29 03:45:15 -0500
commite1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (patch)
treebca1fcfef55b3e3e82c9a822b4ac6428fce2b419 /include/linux/init_task.h
parent2b583d8bc8d7105b58d7481a4a0ceb718dac49c6 (diff)
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff)
Merge branch 'linus' into perfcounters/core
Conflicts: fs/exec.c include/linux/init_task.h Simple context conflicts.
Diffstat (limited to 'include/linux/init_task.h')
-rw-r--r--include/linux/init_task.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 467cff545c30..d0e6cf3b201c 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -57,7 +57,6 @@ extern struct nsproxy init_nsproxy;
57 .mnt_ns = NULL, \ 57 .mnt_ns = NULL, \
58 INIT_NET_NS(net_ns) \ 58 INIT_NET_NS(net_ns) \
59 INIT_IPC_NS(ipc_ns) \ 59 INIT_IPC_NS(ipc_ns) \
60 .user_ns = &init_user_ns, \
61} 60}
62 61
63#define INIT_SIGHAND(sighand) { \ 62#define INIT_SIGHAND(sighand) { \
@@ -113,6 +112,8 @@ extern struct group_info init_groups;
113# define CAP_INIT_BSET CAP_INIT_EFF_SET 112# define CAP_INIT_BSET CAP_INIT_EFF_SET
114#endif 113#endif
115 114
115extern struct cred init_cred;
116
116#ifdef CONFIG_PERF_COUNTERS 117#ifdef CONFIG_PERF_COUNTERS
117# define INIT_PERF_COUNTERS(tsk) \ 118# define INIT_PERF_COUNTERS(tsk) \
118 .perf_counter_ctx.counter_list = \ 119 .perf_counter_ctx.counter_list = \
@@ -157,13 +158,10 @@ extern struct group_info init_groups;
157 .children = LIST_HEAD_INIT(tsk.children), \ 158 .children = LIST_HEAD_INIT(tsk.children), \
158 .sibling = LIST_HEAD_INIT(tsk.sibling), \ 159 .sibling = LIST_HEAD_INIT(tsk.sibling), \
159 .group_leader = &tsk, \ 160 .group_leader = &tsk, \
160 .group_info = &init_groups, \ 161 .real_cred = &init_cred, \
161 .cap_effective = CAP_INIT_EFF_SET, \ 162 .cred = &init_cred, \
162 .cap_inheritable = CAP_INIT_INH_SET, \ 163 .cred_exec_mutex = \
163 .cap_permitted = CAP_FULL_SET, \ 164 __MUTEX_INITIALIZER(tsk.cred_exec_mutex), \
164 .cap_bset = CAP_INIT_BSET, \
165 .securebits = SECUREBITS_DEFAULT, \
166 .user = INIT_USER, \
167 .comm = "swapper", \ 165 .comm = "swapper", \
168 .thread = INIT_THREAD, \ 166 .thread = INIT_THREAD, \
169 .fs = &init_fs, \ 167 .fs = &init_fs, \