5 files changed, 8 insertions, 8 deletions

diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c
index ea8647411462..7eebb08a953a 100644
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@@ -337,7 +337,7 @@ EXPORT_SYMBOL(dump_stack);
  */
 unsigned long thread_saved_pc(struct task_struct *tsk)
 {
-        return tsk->thread_info->kpc;
+        return task_thread_info(tsk)->kpc;
 }
 
 /*
@@ -724,7 +724,7 @@ unsigned long get_wchan(struct task_struct *task)
             task->state == TASK_RUNNING)
                 goto out;
 
-        fp = task->thread_info->ksp + bias;
+        fp = task_thread_info(task)->ksp + bias;
         do {
                 /* Bogus frame pointer? */
                 if (fp < (task_base + sizeof(struct thread_info)) ||
diff --git a/arch/sparc/kernel/ptrace.c b/arch/sparc/kernel/ptrace.c
index fc470c0e9dc6..1baf13ed5c3a 100644
--- a/arch/sparc/kernel/ptrace.c
+++ b/arch/sparc/kernel/ptrace.c
@@ -75,7 +75,7 @@ static inline void read_sunos_user(struct pt_regs *regs, unsigned long offset,
                                    struct task_struct *tsk, long __user *addr)
 {
         struct pt_regs *cregs = tsk->thread.kregs;
-        struct thread_info *t = tsk->thread_info;
+        struct thread_info *t = task_thread_info(tsk);
         int v;
         
         if(offset >= 1024)
@@ -170,7 +170,7 @@ static inline void write_sunos_user(struct pt_regs *regs, unsigned long offset,
                                     struct task_struct *tsk)
 {
         struct pt_regs *cregs = tsk->thread.kregs;
-        struct thread_info *t = tsk->thread_info;
+        struct thread_info *t = task_thread_info(tsk);
         unsigned long value = regs->u_regs[UREG_I3];
 
         if(offset >= 1024)
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c
index cc1fc898495c..40d426cce824 100644
--- a/arch/sparc/kernel/sun4d_smp.c
+++ b/arch/sparc/kernel/sun4d_smp.c
@@ -200,7 +200,7 @@ void __init smp4d_boot_cpus(void)
                         /* Cook up an idler for this guy. */
                         p = fork_idle(i);
                         cpucount++;
-                        current_set[i] = p->thread_info;
+                        current_set[i] = task_thread_info(p);
                         for (no = 0; !cpu_find_by_instance(no, NULL, &mid)
                                      && mid != i; no++) ;
 
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index f113422a3727..a21f27d10e55 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -173,7 +173,7 @@ void __init smp4m_boot_cpus(void)
                         /* Cook up an idler for this guy. */
                         p = fork_idle(i);
                         cpucount++;
-                        current_set[i] = p->thread_info;
+                        current_set[i] = task_thread_info(p);
                         /* See trampoline.S for details... */
                         entry += ((i-1) * 3);
 
diff --git a/arch/sparc/kernel/traps.c b/arch/sparc/kernel/traps.c
index 3f451ae66482..41d45c298fb2 100644
--- a/arch/sparc/kernel/traps.c
+++ b/arch/sparc/kernel/traps.c
@@ -291,7 +291,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc,
 #ifndef CONFIG_SMP
         if(!fpt) {
 #else
-        if(!(fpt->thread_info->flags & _TIF_USEDFPU)) {
+        if(!(task_thread_info(fpt)->flags & _TIF_USEDFPU)) {
 #endif
                 fpsave(&fake_regs[0], &fake_fsr, &fake_queue[0], &fake_depth);
                 regs->psr &= ~PSR_EF;
@@ -334,7 +334,7 @@ void do_fpe_trap(struct pt_regs *regs, unsigned long pc, unsigned long npc,
         /* nope, better SIGFPE the offending process... */
                
 #ifdef CONFIG_SMP
-        fpt->thread_info->flags &= ~_TIF_USEDFPU;
+        task_thread_info(fpt)->flags &= ~_TIF_USEDFPU;
 #endif
         if(psr & PSR_PS) {
                 /* The first fsr store/load we tried trapped,