From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/sparc/kernel/process.c | 4 ++-- arch/sparc/kernel/ptrace.c | 4 ++-- arch/sparc/kernel/sun4d_smp.c | 2 +- arch/sparc/kernel/sun4m_smp.c | 2 +- arch/sparc/kernel/traps.c | 4 ++-- include/asm-sparc/system.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff -puN arch/sparc/kernel/process.c~sparc-task_thread_info arch/sparc/kernel/process.c --- devel/arch/sparc/kernel/process.c~sparc-task_thread_info 2006-01-04 22:02:08.000000000 -0800 +++ devel-akpm/arch/sparc/kernel/process.c 2006-01-04 22:02:08.000000000 -0800 @@ -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_stru 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 -puN arch/sparc/kernel/ptrace.c~sparc-task_thread_info arch/sparc/kernel/ptrace.c --- devel/arch/sparc/kernel/ptrace.c~sparc-task_thread_info 2006-01-04 22:02:08.000000000 -0800 +++ devel-akpm/arch/sparc/kernel/ptrace.c 2006-01-04 22:02:08.000000000 -0800 @@ -75,7 +75,7 @@ static inline void read_sunos_user(struc 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(stru 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 -puN arch/sparc/kernel/sun4d_smp.c~sparc-task_thread_info arch/sparc/kernel/sun4d_smp.c --- devel/arch/sparc/kernel/sun4d_smp.c~sparc-task_thread_info 2006-01-04 22:02:08.000000000 -0800 +++ devel-akpm/arch/sparc/kernel/sun4d_smp.c 2006-01-04 22:02:08.000000000 -0800 @@ -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 -puN arch/sparc/kernel/sun4m_smp.c~sparc-task_thread_info arch/sparc/kernel/sun4m_smp.c --- devel/arch/sparc/kernel/sun4m_smp.c~sparc-task_thread_info 2006-01-04 22:02:08.000000000 -0800 +++ devel-akpm/arch/sparc/kernel/sun4m_smp.c 2006-01-04 22:02:08.000000000 -0800 @@ -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 -puN arch/sparc/kernel/traps.c~sparc-task_thread_info arch/sparc/kernel/traps.c --- devel/arch/sparc/kernel/traps.c~sparc-task_thread_info 2006-01-04 22:02:08.000000000 -0800 +++ devel-akpm/arch/sparc/kernel/traps.c 2006-01-04 22:02:08.000000000 -0800 @@ -291,7 +291,7 @@ void do_fpe_trap(struct pt_regs *regs, u #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, u /* 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, diff -puN include/asm-sparc/system.h~sparc-task_thread_info include/asm-sparc/system.h --- devel/include/asm-sparc/system.h~sparc-task_thread_info 2006-01-04 22:02:08.000000000 -0800 +++ devel-akpm/include/asm-sparc/system.h 2006-01-04 22:02:08.000000000 -0800 @@ -155,7 +155,7 @@ extern void fpsave(unsigned long *fpregs "here:\n" \ : "=&r" (last) \ : "r" (&(current_set[hard_smp_processor_id()])), \ - "r" ((next)->thread_info), \ + "r" (task_thread_info(next)), \ "i" (TI_KPSR), \ "i" (TI_KSP), \ "i" (TI_TASK) \ _