vserver 2.0 rc7

[linux-2.6.git] / include / linux / init_task.h

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index b6a9492..980b7ae 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -51,6 +51,7 @@
                .list = LIST_HEAD_INIT(sig.shared_pending.list),        \
                .signal =  {{0}}}, \
        .posix_timers    = LIST_HEAD_INIT(sig.posix_timers),            \
+       .cpu_timers     = INIT_CPU_TIMERS(sig.cpu_timers),              \
        .rlim           = INIT_RLIMITS,                                 \
 }
 
@@ -89,9 +90,6 @@ extern struct group_info init_groups;
        .children       = LIST_HEAD_INIT(tsk.children),                 \
        .sibling        = LIST_HEAD_INIT(tsk.sibling),                  \
        .group_leader   = &tsk,                                         \
-       .real_timer     = {                                             \
-               .function       = it_real_fn                            \
-       },                                                              \
        .group_info     = &init_groups,                                 \
        .cap_effective  = CAP_INIT_EFF_SET,                             \
        .cap_inheritable = CAP_INIT_INH_SET,                            \
@@ -112,6 +110,7 @@ extern struct group_info init_groups;
        .proc_lock      = SPIN_LOCK_UNLOCKED,                           \
        .switch_lock    = SPIN_LOCK_UNLOCKED,                           \
        .journal_info   = NULL,                                         \
+       .cpu_timers     = INIT_CPU_TIMERS(tsk.cpu_timers),              \
        .xid            = 0,                                            \
        .vx_info        = NULL,                                         \
        .nid            = 0,                                            \
@@ -119,5 +118,12 @@ extern struct group_info init_groups;
 }
 
 
+#define INIT_CPU_TIMERS(cpu_timers)                                    \
+{                                                                      \
+       LIST_HEAD_INIT(cpu_timers[0]),                                  \
+       LIST_HEAD_INIT(cpu_timers[1]),                                  \
+       LIST_HEAD_INIT(cpu_timers[2]),                                  \
+}
+
 
 #endif