8 files changed, 13 insertions, 14 deletions

diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index 6c358b33316..f838b36cc76 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -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;
 
diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c
index 456ec438728..0c82b25d8c6 100644
--- a/arch/mips/kernel/ptrace32.c
+++ b/arch/mips/kernel/ptrace32.c
@@ -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;
 
diff --git a/arch/mips/kernel/smp_mt.c b/arch/mips/kernel/smp_mt.c
index d429544ba4b..794a1c3de2a 100644
--- a/arch/mips/kernel/smp_mt.c
+++ b/arch/mips/kernel/smp_mt.c
@@ -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);
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index 006881942aa..332358430ff 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -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;
 
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 7058893d5ad..59a187956de 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -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)))
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index 0527170d6ad..f17f575f58f 100644
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -93,8 +93,8 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
  */
 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;
diff --git a/arch/mips/sgi-ip27/ip27-smp.c b/arch/mips/sgi-ip27/ip27-smp.c
index 3a8291b7d26..dbef3f6b565 100644
--- a/arch/mips/sgi-ip27/ip27-smp.c
+++ b/arch/mips/sgi-ip27/ip27-smp.c
@@ -168,8 +168,8 @@ void __init prom_prepare_cpus(unsigned int max_cpus)
  */
 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),
diff --git a/arch/mips/sibyte/cfe/smp.c b/arch/mips/sibyte/cfe/smp.c
index e8485124b8f..4477af3d807 100644
--- a/arch/mips/sibyte/cfe/smp.c
+++ b/arch/mips/sibyte/cfe/smp.c
@@ -60,7 +60,7 @@ void prom_boot_secondary(int cpu, struct task_struct *idle)
 
         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);
 }