aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/init_task.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-25 10:40:10 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-25 10:40:10 -0500
commit2e31add2a7e2a15d07f592c21ba35870fa9a1d1f (patch)
tree814e2c70fb5528f108114c0da6e5a1e219e6a0e1 /include/linux/init_task.h
parentd639bab8da86d330493487e8c0fea8ca31f53427 (diff)
parent17581ad812a9abb0182260374ef2e52d4a808a64 (diff)
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'include/linux/init_task.h')
-rw-r--r--include/linux/init_task.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 2f3c2d4ef73b..e752d973fa21 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -48,6 +48,11 @@ extern struct fs_struct init_fs;
48 .posix_timers = LIST_HEAD_INIT(sig.posix_timers), \ 48 .posix_timers = LIST_HEAD_INIT(sig.posix_timers), \
49 .cpu_timers = INIT_CPU_TIMERS(sig.cpu_timers), \ 49 .cpu_timers = INIT_CPU_TIMERS(sig.cpu_timers), \
50 .rlim = INIT_RLIMITS, \ 50 .rlim = INIT_RLIMITS, \
51 .cputimer = { \
52 .cputime = INIT_CPUTIME, \
53 .running = 0, \
54 .lock = __SPIN_LOCK_UNLOCKED(sig.cputimer.lock), \
55 }, \
51} 56}
52 57
53extern struct nsproxy init_nsproxy; 58extern struct nsproxy init_nsproxy;