mips: task_thread_info()
Subsystems (3)
PATCH 48/50 mips: task_thread_info()
References: <[email protected]>
In-Reply-To: <[email protected]>
Signed-off-by Al Viro <[email protected]>
---
arch/mips/kernel/ptrace.c | 2 +- arch/mips/kernel/ptrace32.c | 4 ++-- arch/mips/kernel/smp_mt.c | 7 +++---- arch/mips/kernel/syscall.c | 2 +- arch/mips/kernel/traps.c | 2 +- arch/mips/pmc-sierra/yosemite/smp.c | 4 ++-- arch/mips/sgi-ip27/ip27-smp.c | 4 ++-- arch/mips/sibyte/cfe/smp.c | 2 +- 8 files changed, 13 insertions(+), 14 deletions(-)
3d3f558e9c924cc0a4b1ed08493dba5e6aa391e9
arch/mips/kernel/ptrace.c +1 -1
@@ -442,7 +442,7 @@ long arch_ptrace(struct task_struct *chibreak ;case PTRACE_GET_THREAD_AREA : - ret =put_user (child->thread_info->tp_value, + ret =put_user (task_thread_info (child)->tp_value, (unsigned long __user *) data);break ;
arch/mips/kernel/ptrace32.c +2 -2
@@ -393,7 +393,7 @@ asmlinkage int sys32_ptrace(int request,break ;case PTRACE_GET_THREAD_AREA : - ret =put_user (child->thread_info->tp_value, + ret =put_user (task_thread_info (child)->tp_value, (unsigned int __user *) (unsigned long ) data);break ;
@@ -407,7 +407,7 @@ asmlinkage int sys32_ptrace(int request,break ;case PTRACE_GET_THREAD_AREA_3264 : - ret =put_user (child->thread_info->tp_value, + ret =put_user (task_thread_info (child)->tp_value, (unsigned long __user *) (unsigned long ) data);break ;
arch/mips/kernel/smp_mt.c +3 -4
@@ -287,6 +287,7 @@ void prom_prepare_cpus(unsigned int max_*/ void prom_boot_secondary (int cpu,struct task_struct *idle) { +struct thread_info *gp =task_thread_info (idle);dvpe ();set_c0_mvpcontrol (MVPCONTROL_VPC );
@@ -307,11 +308,9 @@ void prom_boot_secondary(int cpu, structwrite_tc_gpr_sp (__KSTK_TOS (idle));/* global pointer */ -write_tc_gpr_gp ((unsigned long )idle->thread_info); +write_tc_gpr_gp ((unsigned long )gp); -flush_icache_range ((unsigned long )idle->thread_info, - (unsigned long )idle->thread_info + -sizeof (struct thread_info )); +flush_icache_range ((unsigned long )gp, (unsigned long )(gp +1 ));/* finally out of configuration and into chaos */ clear_c0_mvpcontrol (MVPCONTROL_VPC );
arch/mips/kernel/syscall.c +1 -1
@@ -262,7 +262,7 @@ asmlinkage int sys_olduname(struct oldolvoid sys_set_thread_area (unsigned long addr) { -struct thread_info *ti = current->thread_info; +struct thread_info *ti =task_thread_info (current); ti->tp_value = addr;
arch/mips/kernel/traps.c +1 -1
@@ -519,7 +519,7 @@ static inline int simulate_llsc(struct p*/ static inline int simulate_rdhwr (struct pt_regs *regs) { -struct thread_info *ti = current->thread_info; +struct thread_info *ti =task_thread_info (current);unsigned int opcode;if (unlikely (get_insn_opcode (regs, &opcode)))
arch/mips/pmc-sierra/yosemite/smp.c +2 -2
@@ -93,8 +93,8 @@ void __init prom_prepare_cpus(unsigned i*/ void prom_boot_secondary (int cpu,struct task_struct *idle) { -unsigned long gp = (unsigned long ) idle->thread_info; -unsigned long sp = gp +THREAD_SIZE -32 ; +unsigned long gp = (unsigned long )task_thread_info (idle); +unsigned long sp =__KSTK_TOP (idle); secondary_sp = sp; secondary_gp = gp;
arch/mips/sgi-ip27/ip27-smp.c +2 -2
@@ -168,8 +168,8 @@ void __init prom_prepare_cpus(unsigned i*/ void __init prom_boot_secondary (int cpu,struct task_struct *idle) { -unsigned long gp = (unsigned long ) idle->thread_info; -unsigned long sp = gp +THREAD_SIZE -32 ; +unsigned long gp = (unsigned long )task_thread_info (idle); +unsigned long sp =__KSTK_TOS (idle); LAUNCH_SLAVE(cputonasid(cpu),cputoslice(cpu), (launch_proc_t)MAPPED_KERN_RW_TO_K0(smp_bootstrap),
arch/mips/sibyte/cfe/smp.c +1 -1
@@ -60,7 +60,7 @@ void prom_boot_secondary(int cpu, struct retval =cfe_cpu_start (cpu_logical_map (cpu), &smp_bootstrap,__KSTK_TOS (idle), - (unsigned long )idle->thread_info,0 ); + (unsigned long )task_thread_info (idle),0 );if (retval !=0 )printk ("cfe_start_cpu(%i) returned %i\n" , cpu, retval); }
Signature · 1 line
0.99.9.GIT