1 files changed, 8 insertions, 8 deletions

diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index b1ed1cd8e2a8..1f43fa56f600 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -16,7 +16,7 @@ extern struct files_struct init_files;
 extern struct fs_struct init_fs;
 
 #define INIT_SIGNALS(sig) {                                             \
-        .count          = ATOMIC_INIT(1),                               \
+        .nr_threads     = 1,                                            \
         .wait_chldexit  = __WAIT_QUEUE_HEAD_INITIALIZER(sig.wait_chldexit),\
         .shared_pending = {                                             \
                 .list = LIST_HEAD_INIT(sig.shared_pending.list),        \
@@ -35,7 +35,7 @@ extern struct nsproxy init_nsproxy;
 
 #define INIT_SIGHAND(sighand) {                                         \
         .count          = ATOMIC_INIT(1),                               \
-        .action         = { { { .sa_handler = NULL, } }, },             \
+        .action         = { { { .sa_handler = SIG_DFL, } }, },          \
         .siglock        = __SPIN_LOCK_UNLOCKED(sighand.siglock),        \
         .signalfd_wqh   = __WAIT_QUEUE_HEAD_INITIALIZER(sighand.signalfd_wqh),  \
 }
@@ -45,11 +45,10 @@ extern struct group_info init_groups;
 #define INIT_STRUCT_PID {                                               \
         .count          = ATOMIC_INIT(1),                               \
         .tasks          = {                                             \
-                { .first = &init_task.pids[PIDTYPE_PID].node },         \
-                { .first = &init_task.pids[PIDTYPE_PGID].node },        \
-                { .first = &init_task.pids[PIDTYPE_SID].node },         \
+                { .first = NULL },                                      \
+                { .first = NULL },                                      \
+                { .first = NULL },                                      \
         },                                                              \
-        .rcu            = RCU_HEAD_INIT,                                \
         .level          = 0,                                            \
         .numbers        = { {                                           \
                 .nr             = 0,                                    \
@@ -62,7 +61,7 @@ extern struct group_info init_groups;
 {                                                               \
         .node = {                                               \
                 .next = NULL,                                   \
-                .pprev = &init_struct_pid.tasks[type].first,    \
+                .pprev = NULL,                                  \
         },                                                      \
         .pid = &init_struct_pid,                                \
 }
@@ -164,6 +163,7 @@ extern struct cred init_cred;
                 [PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID),           \
                 [PIDTYPE_SID]  = INIT_PID_LINK(PIDTYPE_SID),            \
         },                                                              \
+        .thread_group   = LIST_HEAD_INIT(tsk.thread_group),             \
         .dirties = INIT_PROP_LOCAL_SINGLE(dirties),                     \
         INIT_IDS                                                        \
         INIT_PERF_EVENTS(tsk)                                           \
@@ -183,7 +183,7 @@ extern struct cred init_cred;
 }
 
 /* Attach to the init_task data structure for proper alignment */
-#define __init_task_data __attribute__((__section__(".data.init_task")))
+#define __init_task_data __attribute__((__section__(".data..init_task")))
 
 
 #endif