powerpc: Update comments in preparation for THREAD_INFO_IN_TASK

[thirdparty/kernel/stable.git] / arch / powerpc / kernel / head_fsl_booke.S

diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 2386ce2a9c6e4604ecc5a8f245858d3f0c547b6b..6301bb24889a380ccaf130ba40a949be9f02dfe7 100644 (file)
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -243,8 +243,10 @@ set_ivor:
        li      r0,0
        stwu    r0,THREAD_SIZE-STACK_FRAME_OVERHEAD(r1)
 
+#ifdef CONFIG_SMP
        CURRENT_THREAD_INFO(r22, r1)
        stw     r24, TI_CPU(r22)
+#endif
 
        bl      early_init
 
@@ -717,7 +719,7 @@ finish_tlb_load:
 
        /* Get the next_tlbcam_idx percpu var */
 #ifdef CONFIG_SMP
-       lwz     r12, THREAD_INFO-THREAD(r12)
+       lwz     r12, TASK_STACK-THREAD(r12)
        lwz     r15, TI_CPU(r12)
        lis     r14, __per_cpu_offset@h
        ori     r14, r14, __per_cpu_offset@l
@@ -1089,7 +1091,7 @@ __secondary_start:
        mr      r4,r24          /* Why? */
        bl      call_setup_cpu
 
-       /* get current_thread_info and current */
+       /* get current's stack and current */
        lis     r1,secondary_ti@ha
        lwz     r1,secondary_ti@l(r1)
        lwz     r2,TI_TASK(r1)