vserver 1.9.5.x5

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

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 9bcf2db..b6a9492 100644 (file)
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -46,16 +46,18 @@
 
 #define INIT_SIGNALS(sig) {    \
        .count          = ATOMIC_INIT(1),               \
+       .wait_chldexit  = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\
        .shared_pending = {                             \
                .list = LIST_HEAD_INIT(sig.shared_pending.list),        \
                .signal =  {{0}}}, \
        .posix_timers    = LIST_HEAD_INIT(sig.posix_timers),            \
+       .rlim           = INIT_RLIMITS,                                 \
 }
 
-#define INIT_SIGHAND(sighand) {        \
-       .count          = ATOMIC_INIT(1),               \
-       .action         = { {{NULL,}}, },               \
-       .siglock        = SPIN_LOCK_UNLOCKED,           \
+#define INIT_SIGHAND(sighand) {                                                \
+       .count          = ATOMIC_INIT(1),                               \
+       .action         = { { { .sa_handler = NULL, } }, },             \
+       .siglock        = SPIN_LOCK_UNLOCKED,                           \
 }
 
 extern struct group_info init_groups;
@@ -87,7 +89,6 @@ extern struct group_info init_groups;
        .children       = LIST_HEAD_INIT(tsk.children),                 \
        .sibling        = LIST_HEAD_INIT(tsk.sibling),                  \
        .group_leader   = &tsk,                                         \
-       .wait_chldexit  = __WAIT_QUEUE_HEAD_INITIALIZER(tsk.wait_chldexit),\
        .real_timer     = {                                             \
                .function       = it_real_fn                            \
        },                                                              \
@@ -96,7 +97,6 @@ extern struct group_info init_groups;
        .cap_inheritable = CAP_INIT_INH_SET,                            \
        .cap_permitted  = CAP_FULL_SET,                                 \
        .keep_capabilities = 0,                                         \
-       .rlim           = INIT_RLIMITS,                                 \
        .user           = INIT_USER,                                    \
        .comm           = "swapper",                                    \
        .thread         = INIT_THREAD,                                  \