futex: Add bitset conditional wait/wakeup functionality

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

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index d4b2f1c76e12c528b8701111445bd864ef5ea062..e6b3f70806790b2a8e7810b3258cddc8b69cb748 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -67,9 +67,6 @@
        .posix_timers    = LIST_HEAD_INIT(sig.posix_timers),            \
        .cpu_timers     = INIT_CPU_TIMERS(sig.cpu_timers),              \
        .rlim           = INIT_RLIMITS,                                 \
-       .pgrp           = 0,                                            \
-       .tty_old_pgrp   = NULL,                                         \
-       { .__session      = 0},                                         \
 }
 
 extern struct nsproxy init_nsproxy;
@@ -94,15 +91,18 @@ extern struct group_info init_groups;
 
 #define INIT_STRUCT_PID {                                              \
        .count          = ATOMIC_INIT(1),                               \
-       .nr             = 0,                                            \
-       /* Don't put this struct pid in pid_hash */                     \
-       .pid_chain      = { .next = NULL, .pprev = NULL },              \
        .tasks          = {                                             \
                { .first = &init_task.pids[PIDTYPE_PID].node },         \
                { .first = &init_task.pids[PIDTYPE_PGID].node },        \
                { .first = &init_task.pids[PIDTYPE_SID].node },         \
        },                                                              \
        .rcu            = RCU_HEAD_INIT,                                \
+       .level          = 0,                                            \
+       .numbers        = { {                                           \
+               .nr             = 0,                                    \
+               .ns             = &init_pid_ns,                         \
+               .pid_chain      = { .next = NULL, .pprev = NULL },      \
+       }, }                                                            \
 }
 
 #define INIT_PID_LINK(type)                                    \
@@ -132,9 +132,11 @@ extern struct group_info init_groups;
        .cpus_allowed   = CPU_MASK_ALL,                                 \
        .mm             = NULL,                                         \
        .active_mm      = &init_mm,                                     \
-       .run_list       = LIST_HEAD_INIT(tsk.run_list),                 \
-       .ioprio         = 0,                                            \
-       .time_slice     = HZ,                                           \
+       .rt             = {                                             \
+               .run_list       = LIST_HEAD_INIT(tsk.rt.run_list),      \
+               .time_slice     = HZ,                                   \
+               .nr_cpus_allowed = NR_CPUS,                             \
+       },                                                              \
        .tasks          = LIST_HEAD_INIT(tsk.tasks),                    \
        .ptrace_children= LIST_HEAD_INIT(tsk.ptrace_children),          \
        .ptrace_list    = LIST_HEAD_INIT(tsk.ptrace_list),              \