From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/arm/kernel/process.c | 4 ++-- arch/arm/kernel/ptrace.c | 10 +++++----- include/asm-arm/system.h | 2 +- include/asm-arm/thread_info.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff -puN arch/arm/kernel/process.c~arm-task_thread_info arch/arm/kernel/process.c --- devel/arch/arm/kernel/process.c~arm-task_thread_info 2006-01-04 22:02:36.000000000 -0800 +++ devel-akpm/arch/arm/kernel/process.c 2006-01-04 22:02:37.000000000 -0800 @@ -342,10 +342,10 @@ void flush_thread(void) void release_thread(struct task_struct *dead_task) { #if defined(CONFIG_VFP) - vfp_release_thread(&dead_task->thread_info->vfpstate); + vfp_release_thread(&task_thread_info(dead_task)->vfpstate); #endif #if defined(CONFIG_IWMMXT) - iwmmxt_task_release(dead_task->thread_info); + iwmmxt_task_release(task_thread_info(dead_task)); #endif } diff -puN arch/arm/kernel/ptrace.c~arm-task_thread_info arch/arm/kernel/ptrace.c --- devel/arch/arm/kernel/ptrace.c~arm-task_thread_info 2006-01-04 22:02:36.000000000 -0800 +++ devel-akpm/arch/arm/kernel/ptrace.c 2006-01-04 22:02:37.000000000 -0800 @@ -604,7 +604,7 @@ static int ptrace_setregs(struct task_st */ static int ptrace_getfpregs(struct task_struct *tsk, void __user *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; } @@ -613,7 +613,7 @@ static int ptrace_getfpregs(struct task_ */ static int ptrace_setfpregs(struct task_struct *tsk, void __user *ufp) { - struct thread_info *thread = tsk->thread_info; + struct thread_info *thread = task_thread_info(tsk); thread->used_cp[1] = thread->used_cp[2] = 1; return copy_from_user(&thread->fpstate, ufp, sizeof(struct user_fp)) ? -EFAULT : 0; @@ -626,7 +626,7 @@ static int ptrace_setfpregs(struct task_ */ static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp) { - struct thread_info *thread = tsk->thread_info; + struct thread_info *thread = task_thread_info(tsk); void *ptr = &thread->fpstate; if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT)) @@ -643,7 +643,7 @@ static int ptrace_getwmmxregs(struct tas */ static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp) { - struct thread_info *thread = tsk->thread_info; + struct thread_info *thread = task_thread_info(tsk); void *ptr = &thread->fpstate; if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT)) @@ -779,7 +779,7 @@ long arch_ptrace(struct task_struct *chi #endif 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 -puN include/asm-arm/system.h~arm-task_thread_info include/asm-arm/system.h --- devel/include/asm-arm/system.h~arm-task_thread_info 2006-01-04 22:02:36.000000000 -0800 +++ devel-akpm/include/asm-arm/system.h 2006-01-04 22:02:37.000000000 -0800 @@ -168,7 +168,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-arm/thread_info.h~arm-task_thread_info include/asm-arm/thread_info.h --- devel/include/asm-arm/thread_info.h~arm-task_thread_info 2006-01-04 22:02:36.000000000 -0800 +++ devel-akpm/include/asm-arm/thread_info.h 2006-01-04 22:02:37.000000000 -0800 @@ -100,9 +100,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)) extern void iwmmxt_task_disable(struct thread_info *); extern void iwmmxt_task_copy(struct thread_info *, void *); _