Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / s390 / kernel / head64.S

diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 65667b2..6a25080 100644 (file)
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -62,9 +62,9 @@ startup_continue:
        clr     %r11,%r12
        je      5f                      # no more space in prefix array
 4:
-       ahi     %r8,1                           # next cpu (r8 += 1)
-       cl      %r8,.Llast_cpu-.LPG1(%r13)      # is last possible cpu ?
-       jl      1b                              # jump if not last cpu
+       ahi     %r8,1                   # next cpu (r8 += 1)
+       chi     %r8,MAX_CPU_ADDRESS     # is last possible cpu ?
+       jle     1b                      # jump if not last cpu
 5:
        lhi     %r1,2                   # mode 2 = esame (dump)
        j       6f
@@ -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
@@ -129,8 +130,6 @@ startup_continue:
 #ifdef CONFIG_ZFCPDUMP
 .Lcurrent_cpu:
        .long 0x0
-.Llast_cpu:
-       .long 0x0000ffff
 .Lpref_arr_ptr:
        .long zfcpdump_prefix_array
 #endif /* CONFIG_ZFCPDUMP */