powerpc: 'current_set' is now a table of task_struct pointers

The table of pointers 'current_set' has been used for retrieving
the stack and current. They used to be thread_info pointers as
they were pointing to the stack and current was taken from the
'task' field of the thread_info.

Now, the pointers of 'current_set' table are now both pointers
to task_struct and pointers to thread_info.

As they are used to get current, and the stack pointer is
retrieved from current's stack field, this patch changes
their type to task_struct, and renames secondary_ti to
secondary_current.

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/include/asm/asm-prototypes.h b/arch/powerpc/include/asm/asm-prototypes.h
index 1d911f68a23b3747c268c79034b5af3801cf4435..1484df6779ab42afbd69716ea7e3667d6b819537 100644 (file)
--- a/arch/powerpc/include/asm/asm-prototypes.h
+++ b/arch/powerpc/include/asm/asm-prototypes.h
@@ -23,8 +23,8 @@
 #include <uapi/asm/ucontext.h>
 
 /* SMP */
-extern struct thread_info *current_set[NR_CPUS];
-extern struct thread_info *secondary_ti;
+extern struct task_struct *current_set[NR_CPUS];
+extern struct task_struct *secondary_current;
 void start_secondary(void *unused);
 
 /* kexec */

diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 888fcff3f8cc11e7989cfb25477f3078f3594d4f..ce6a972f25849ea87774be809da0faa3d84d96f3 100644 (file)
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -832,9 +832,9 @@ __secondary_start:
 #endif /* CONFIG_PPC_BOOK3S_32 */
 
        /* get current's stack and current */
-       lis     r1,secondary_ti@ha
-       tophys(r1,r1)
-       lwz     r2,secondary_ti@l(r1)
+       lis     r2,secondary_current@ha
+       tophys(r2,r2)
+       lwz     r2,secondary_current@l(r2)
        tophys(r1,r2)
        lwz     r1,TASK_STACK(r1)
 

diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index f94a93b6c2f2f83ab22cb647d07cdc2ccb02c5a7..37117ab11584c7a06a9c2ccc86b2fd3a70f278c4 100644 (file)
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -1020,8 +1020,8 @@ _GLOBAL(start_secondary_47x)
        /* Now we can get our task struct and real stack pointer */
 
        /* Get current's stack and current */
-       lis     r1,secondary_ti@ha
-       lwz     r2,secondary_ti@l(r1)
+       lis     r2,secondary_current@ha
+       lwz     r2,secondary_current@l(r2)
        lwz     r1,TASK_STACK(r2)
 
        /* Current stack pointer */

diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 11f38adbe0201213f37d2cc914f3e86a012c3bb9..4ed2a7c8e89b6573c3d5e75f09fdcb3b9918573b 100644 (file)
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -1091,8 +1091,8 @@ __secondary_start:
        bl      call_setup_cpu
 
        /* get current's stack and current */
-       lis     r1,secondary_ti@ha
-       lwz     r2,secondary_ti@l(r1)
+       lis     r2,secondary_current@ha
+       lwz     r2,secondary_current@l(r2)
        lwz     r1,TASK_STACK(r2)
 
        /* stack */

diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 96c25a89e877400fd42ec76fe20cd8e5ebc8b3fb..e784342bdaa1f8d35a741e6bf62e74c2ed88f2e3 100644 (file)
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -76,7 +76,7 @@
 static DEFINE_PER_CPU(int, cpu_state) = { 0 };
 #endif
 
-struct thread_info *secondary_ti;
+struct task_struct *secondary_current;
 bool has_big_cores;
 
 DEFINE_PER_CPU(cpumask_var_t, cpu_sibling_map);
@@ -631,7 +631,7 @@ void smp_send_stop(void)
 }
 #endif /* CONFIG_NMI_IPI */
 
-struct thread_info *current_set[NR_CPUS];
+struct task_struct *current_set[NR_CPUS];
 
 static void smp_store_cpu_info(int id)
 {
@@ -896,7 +896,7 @@ void smp_prepare_boot_cpu(void)
        paca_ptrs[boot_cpuid]->__current = current;
 #endif
        set_numa_node(numa_cpu_lookup_table[boot_cpuid]);
-       current_set[boot_cpuid] = task_thread_info(current);
+       current_set[boot_cpuid] = current;
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -981,15 +981,13 @@ static bool secondaries_inhibited(void)
 
 static void cpu_idle_thread_init(unsigned int cpu, struct task_struct *idle)
 {
-       struct thread_info *ti = task_thread_info(idle);
-
 #ifdef CONFIG_PPC64
        paca_ptrs[cpu]->__current = idle;
        paca_ptrs[cpu]->kstack = (unsigned long)task_stack_page(idle) +
                                 THREAD_SIZE - STACK_FRAME_OVERHEAD;
 #endif
        idle->cpu = cpu;
-       secondary_ti = current_set[cpu] = ti;
+       secondary_current = current_set[cpu] = idle;
 }
 
 int __cpu_up(unsigned int cpu, struct task_struct *tidle)