diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-14 23:01:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-14 23:01:51 +0000 |
| commit | 331f1f60b19afa06e864c9531e443a2f9f6ee0e4 (patch) | |
| tree | d5ad14bb28d2c1ae648cbe8e1febdfd83e5f2109 | |
| parent | 8f725ef93f5151f6a20bdb492ad9af08c3fdc65e (diff) | |
| parent | 840d0749cba5e4e3477993c1ca89588fabef4a4a (diff) | |
| download | v4.4-331f1f60b19afa06e864c9531e443a2f9f6ee0e4.tar.gz | |
UPSTREAM: fix up initial thread stack pointer vs thread_info confusion am: f707c0f98f
am: 840d0749cb
Change-Id: I605f7ac60d37f025d8a8569f7b1bafe4164d613f
| -rw-r--r-- | arch/ia64/kernel/init_task.c | 1 | ||||
| -rw-r--r-- | include/linux/init_task.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/init_task.c b/arch/ia64/kernel/init_task.c index f9efe9739d3f..0eaa89f3defd 100644 --- a/arch/ia64/kernel/init_task.c +++ b/arch/ia64/kernel/init_task.c @@ -26,6 +26,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand); * handled. This is done by having a special ".data..init_task" section... */ #define init_thread_info init_task_mem.s.thread_info +#define init_stack init_task_mem.stack union { struct { diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 1c1ff7e4faa4..9a0056499337 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, \ |