Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc8f6029 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] mips: task_thread_info() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40bc9c67

arch/mips/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		break;



	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
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data) 
		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;
@@ -389,7 +389,7 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data) 
		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
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ void prom_prepare_cpus(unsigned int max_cpus) 
 */

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, struct task_struct *idle) 
	write_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
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ asmlinkage int sys_olduname(struct oldold_utsname * name) 


void 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
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ static inline int simulate_llsc(struct pt_regs *regs) 
 */

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)))