From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/arm26/kernel/process.c | 2 +- arch/arm26/kernel/ptrace.c | 4 ++-- include/asm-arm26/system.h | 2 +- include/asm-arm26/thread_info.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff -puN arch/arm26/kernel/process.c~arm26-task_thread_info arch/arm26/kernel/process.c --- devel/arch/arm26/kernel/process.c~arm26-task_thread_info 2006-01-04 22:02:45.000000000 -0800 +++ devel-akpm/arch/arm26/kernel/process.c 2006-01-04 22:02:45.000000000 -0800 @@ -277,7 +277,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long stack_start, unsigned long unused, struct task_struct *p, struct pt_regs *regs) { - struct thread_info *thread = p->thread_info; + struct thread_info *thread = task_thread_info(p); struct pt_regs *childregs; childregs = __get_user_regs(thread); diff -puN arch/arm26/kernel/ptrace.c~arm26-task_thread_info arch/arm26/kernel/ptrace.c --- devel/arch/arm26/kernel/ptrace.c~arm26-task_thread_info 2006-01-04 22:02:45.000000000 -0800 +++ devel-akpm/arch/arm26/kernel/ptrace.c 2006-01-04 22:02:45.000000000 -0800 @@ -532,7 +532,7 @@ static int ptrace_setregs(struct task_st */ static int ptrace_getfpregs(struct task_struct *tsk, void *ufp) { - return copy_to_user(ufp, &tsk->thread_info->fpstate, + return copy_to_user(ufp, &task_thread_info(tsk)->fpstate, sizeof(struct user_fp)) ? -EFAULT : 0; } @@ -542,7 +542,7 @@ static int ptrace_getfpregs(struct task_ static int ptrace_setfpregs(struct task_struct *tsk, void *ufp) { set_stopped_child_used_math(tsk); - return copy_from_user(&tsk->thread_info->fpstate, ufp, + return copy_from_user(&task_threas_info(tsk)->fpstate, ufp, sizeof(struct user_fp)) ? -EFAULT : 0; } diff -puN include/asm-arm26/system.h~arm26-task_thread_info include/asm-arm26/system.h --- devel/include/asm-arm26/system.h~arm26-task_thread_info 2006-01-04 22:02:45.000000000 -0800 +++ devel-akpm/include/asm-arm26/system.h 2006-01-04 22:02:45.000000000 -0800 @@ -111,7 +111,7 @@ extern struct task_struct *__switch_to(s #define switch_to(prev,next,last) \ do { \ - last = __switch_to(prev,prev->thread_info,next->thread_info); \ + last = __switch_to(prev,task_thread_info(prev),task_thread_info(next)); \ } while (0) /* diff -puN include/asm-arm26/thread_info.h~arm26-task_thread_info include/asm-arm26/thread_info.h --- devel/include/asm-arm26/thread_info.h~arm26-task_thread_info 2006-01-04 22:02:45.000000000 -0800 +++ devel-akpm/include/asm-arm26/thread_info.h 2006-01-04 22:02:45.000000000 -0800 @@ -91,9 +91,9 @@ extern void free_thread_info(struct thre #define put_thread_info(ti) put_task_struct((ti)->task) #define thread_saved_pc(tsk) \ - ((unsigned long)(pc_pointer((tsk)->thread_info->cpu_context.pc))) + ((unsigned long)(pc_pointer(task_thread_info(tsk)->cpu_context.pc))) #define thread_saved_fp(tsk) \ - ((unsigned long)((tsk)->thread_info->cpu_context.fp)) + ((unsigned long)(task_thread_info(tsk)->cpu_context.fp)) #else /* !__ASSEMBLY__ */ _