summaryrefslogtreecommitdiffstats
path: root/include/linux/init_task.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-08 11:51:28 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-08 11:51:28 +0200
commit946e0f6ffcaa614012d646f4cf84efdd62628c8b (patch)
tree37d31fd748f98ec4fb7897997a2745228bf0c2da /include/linux/init_task.h
parent67d7a982bab6702d84415ea889996fae72a7d3b2 (diff)
parenta99cde438de0c4c0cecc1d1af1a55a75b10bfdef (diff)
downloadcachepc-linux-946e0f6ffcaa614012d646f4cf84efdd62628c8b.tar.gz
cachepc-linux-946e0f6ffcaa614012d646f4cf84efdd62628c8b.zip
Merge tag 'v4.7-rc6' into x86/mm, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/init_task.h')
-rw-r--r--include/linux/init_task.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index f2cb8d45513d..f8834f820ec2 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -190,7 +190,7 @@ extern struct task_group root_task_group;
#define INIT_TASK(tsk) \
{ \
.state = 0, \
- .stack = &init_thread_info, \
+ .stack = init_stack, \
.usage = ATOMIC_INIT(2), \
.flags = PF_KTHREAD, \
.prio = MAX_PRIO-20, \