Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux.git] / init / init_task.c

diff --git a/init/init_task.c b/init/init_task.c
index 1b15cb90d64fab3abfaa1deadc1738df40906453..7ab773b9b3cd566c504e84d6fc06a0d869705145 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -72,7 +72,8 @@ struct task_struct init_task
        .static_prio    = MAX_PRIO - 20,
        .normal_prio    = MAX_PRIO - 20,
        .policy         = SCHED_NORMAL,
-       .cpus_allowed   = CPU_MASK_ALL,
+       .cpus_ptr       = &init_task.cpus_mask,
+       .cpus_mask      = CPU_MASK_ALL,
        .nr_cpus_allowed= NR_CPUS,
        .mm             = NULL,
        .active_mm      = &init_mm,
@@ -167,7 +168,7 @@ struct task_struct init_task
 #endif
 #ifdef CONFIG_LOCKDEP
        .lockdep_depth = 0, /* no locks held yet */
-       .curr_chain_key = 0,
+       .curr_chain_key = INITIAL_CHAIN_KEY,
        .lockdep_recursion = 0,
 #endif
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER