aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/head64.S
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2016-11-08 11:08:26 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-11-11 16:37:41 +0100
commitd5c352cdd022d2c304c6ab19d100631356f2198c (patch)
tree602e29e76047f489c82e8264011d219943ec78f7 /arch/s390/kernel/head64.S
parents390/preempt: move preempt_count to the lowcore (diff)
downloadlinux-dev-d5c352cdd022d2c304c6ab19d100631356f2198c.tar.xz
linux-dev-d5c352cdd022d2c304c6ab19d100631356f2198c.zip
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/head64.S')
-rw-r--r--arch/s390/kernel/head64.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 03c2b469c472..a46201d2ed07 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -32,10 +32,9 @@ ENTRY(startup_continue)
#
# Setup stack
#
- larl %r15,init_thread_union
- stg %r15,__LC_THREAD_INFO # cache thread info in lowcore
- lg %r14,__TI_task(%r15) # cache current in lowcore
+ larl %r14,init_task
stg %r14,__LC_CURRENT
+ larl %r15,init_thread_union
aghi %r15,1<<(PAGE_SHIFT+THREAD_ORDER) # init_task_union + THREAD_SIZE
stg %r15,__LC_KERNEL_STACK # set end of kernel stack
aghi %r15,-160