From 0494513f7c5e33b8e96e998df4b23cde06aa7c35 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Fri, 11 Sep 2009 10:28:58 +0200 Subject: [PATCH] --- yaml --- r: 157471 b: refs/heads/master c: 0c88ee5b7523e76e290d558c28cd0be48ffad597 h: refs/heads/master i: 157469: a66e7f1a94b7f0cc7e44bcc5d27babefc451dd52 157467: d52bdf65e1cdf72f50ec3fe194b7f46640d82235 157463: ef20111249cd632025bfc1848fa84f134d37e0a5 157455: 4f3ba58223eeb0af2f93d3e0ee710c91c76b6843 157439: e056bfb3e959675cc1436b89f56eafcca16e5383 v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/head31.S | 1 + trunk/arch/s390/kernel/head64.S | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b19388b83124..b99c81fe29ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50aa98bad056a17655864a4d71ebc32d95c629a7 +refs/heads/master: 0c88ee5b7523e76e290d558c28cd0be48ffad597 diff --git a/trunk/arch/s390/kernel/head31.S b/trunk/arch/s390/kernel/head31.S index 2ced846065b7..602b508cd4c4 100644 --- a/trunk/arch/s390/kernel/head31.S +++ b/trunk/arch/s390/kernel/head31.S @@ -24,6 +24,7 @@ startup_continue: # Setup stack # l %r15,.Linittu-.LPG1(%r13) + st %r15,__LC_THREAD_INFO # cache thread info in lowcore mvc __LC_CURRENT(4),__TI_task(%r15) ahi %r15,1<<(PAGE_SHIFT+THREAD_ORDER) # init_task_union+THREAD_SIZE st %r15,__LC_KERNEL_STACK # set end of kernel stack diff --git a/trunk/arch/s390/kernel/head64.S b/trunk/arch/s390/kernel/head64.S index 65667b2e65ce..bdcb3f05bcd1 100644 --- a/trunk/arch/s390/kernel/head64.S +++ b/trunk/arch/s390/kernel/head64.S @@ -92,6 +92,7 @@ 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 stg %r14,__LC_CURRENT aghi %r15,1<<(PAGE_SHIFT+THREAD_ORDER) # init_task_union + THREAD_SIZE