diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:34:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:34:07 -0500 |
| commit | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (patch) | |
| tree | 7007f2ff846b9b057c5cd7c25e8b82e49f9b4b63 /include/linux/init_task.h | |
| parent | 4bcf349a0f90d1e69eb35c6df0fa285c886c1cd6 (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
Merge branch 'linus' into perfcounters/core
Conflicts:
arch/x86/kernel/acpi/boot.c
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 dc4ef0023d88..2ee96942a9d6 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h | |||
| @@ -48,12 +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 | .cputime = { .totals = { \ | 51 | .cputimer = { \ |
| 52 | .utime = cputime_zero, \ | 52 | .cputime = INIT_CPUTIME, \ |
| 53 | .stime = cputime_zero, \ | 53 | .running = 0, \ |
| 54 | .sum_exec_runtime = 0, \ | 54 | .lock = __SPIN_LOCK_UNLOCKED(sig.cputimer.lock), \ |
| 55 | .lock = __SPIN_LOCK_UNLOCKED(sig.cputime.totals.lock), \ | 55 | }, \ |
| 56 | }, }, \ | ||
| 57 | } | 56 | } |
| 58 | 57 | ||
| 59 | extern struct nsproxy init_nsproxy; | 58 | extern struct nsproxy init_nsproxy; |