diff options
| author | James Morris <jmorris@namei.org> | 2009-03-24 00:52:46 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-24 00:52:46 +0100 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /include/linux/init_task.h | |
| parent | SELinux: inode_doinit_with_dentry drop no dentry printk (diff) | |
| parent | Linux 2.6.29 (diff) | |
| download | linux-703a3cd72817e99201cef84a8a7aecc60b2b3581.tar.xz linux-703a3cd72817e99201cef84a8a7aecc60b2b3581.zip | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index ea0ea1a4c36f..e752d973fa21 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -48,12 +48,11 @@ extern struct fs_struct init_fs; .posix_timers = LIST_HEAD_INIT(sig.posix_timers), \ .cpu_timers = INIT_CPU_TIMERS(sig.cpu_timers), \ .rlim = INIT_RLIMITS, \ - .cputime = { .totals = { \ - .utime = cputime_zero, \ - .stime = cputime_zero, \ - .sum_exec_runtime = 0, \ - .lock = __SPIN_LOCK_UNLOCKED(sig.cputime.totals.lock), \ - }, }, \ + .cputimer = { \ + .cputime = INIT_CPUTIME, \ + .running = 0, \ + .lock = __SPIN_LOCK_UNLOCKED(sig.cputimer.lock), \ + }, \ } extern struct nsproxy init_nsproxy; |