diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2016-11-08 11:08:26 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2016-11-11 16:37:41 +0100 |
| commit | d5c352cdd022d2c304c6ab19d100631356f2198c (patch) | |
| tree | 602e29e76047f489c82e8264011d219943ec78f7 /arch/s390/kernel/setup.c | |
| parent | c360192bf4a8dc72f102dd6a4e1bf8bd0b404cfa (diff) | |
| download | op-kernel-dev-d5c352cdd022d2c304c6ab19d100631356f2198c.zip op-kernel-dev-d5c352cdd022d2c304c6ab19d100631356f2198c.tar.gz | |
s390: move thread_info into task_struct
This is the s390 variant of commit 15f4eae70d36 ("x86: Move
thread_info into task_struct").
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 268d6c1..b75da68 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -329,8 +329,7 @@ static void __init setup_lowcore(void) lc->panic_stack = (unsigned long) __alloc_bootmem(PAGE_SIZE, PAGE_SIZE, 0) + PAGE_SIZE - STACK_FRAME_OVERHEAD - sizeof(struct pt_regs); - lc->current_task = (unsigned long) init_thread_union.thread_info.task; - lc->thread_info = (unsigned long) &init_thread_union; + lc->current_task = (unsigned long)&init_task; lc->lpp = LPP_MAGIC; lc->machine_flags = S390_lowcore.machine_flags; lc->preempt_count = S390_lowcore.preempt_count; |
