Merge commit 'v2.6.29-rc4' into perfcounters/core

Conflicts:
	arch/x86/kernel/setup_percpu.c
	arch/x86/mm/fault.c
	drivers/acpi/processor_idle.c
	kernel/irq/handle.c

1 files changed, 6 insertions, 0 deletions

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 49a40fbc806b..dc4ef0023d88 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -48,6 +48,12 @@ 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),  \
+        }, },                                                           \
 }
 
 extern struct nsproxy init_nsproxy;