aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/kernel/process.c4
-rw-r--r--arch/arm/kernel/ptrace.c10
-rw-r--r--include/asm-arm/system.h2
-rw-r--r--include/asm-arm/thread_info.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index 54a21bdcba5c..46d0984b44ff 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -342,10 +342,10 @@ void flush_thread(void)
342void release_thread(struct task_struct *dead_task) 342void release_thread(struct task_struct *dead_task)
343{ 343{
344#if defined(CONFIG_VFP) 344#if defined(CONFIG_VFP)
345 vfp_release_thread(&dead_task->thread_info->vfpstate); 345 vfp_release_thread(&task_thread_info(dead_task)->vfpstate);
346#endif 346#endif
347#if defined(CONFIG_IWMMXT) 347#if defined(CONFIG_IWMMXT)
348 iwmmxt_task_release(dead_task->thread_info); 348 iwmmxt_task_release(task_thread_info(dead_task));
349#endif 349#endif
350} 350}
351 351
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index 2b84f78d7b0f..f003062c9457 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -604,7 +604,7 @@ static int ptrace_setregs(struct task_struct *tsk, void __user *uregs)
604 */ 604 */
605static int ptrace_getfpregs(struct task_struct *tsk, void __user *ufp) 605static int ptrace_getfpregs(struct task_struct *tsk, void __user *ufp)
606{ 606{
607 return copy_to_user(ufp, &tsk->thread_info->fpstate, 607 return copy_to_user(ufp, &task_thread_info(tsk)->fpstate,
608 sizeof(struct user_fp)) ? -EFAULT : 0; 608 sizeof(struct user_fp)) ? -EFAULT : 0;
609} 609}
610 610
@@ -613,7 +613,7 @@ static int ptrace_getfpregs(struct task_struct *tsk, void __user *ufp)
613 */ 613 */
614static int ptrace_setfpregs(struct task_struct *tsk, void __user *ufp) 614static int ptrace_setfpregs(struct task_struct *tsk, void __user *ufp)
615{ 615{
616 struct thread_info *thread = tsk->thread_info; 616 struct thread_info *thread = task_thread_info(tsk);
617 thread->used_cp[1] = thread->used_cp[2] = 1; 617 thread->used_cp[1] = thread->used_cp[2] = 1;
618 return copy_from_user(&thread->fpstate, ufp, 618 return copy_from_user(&thread->fpstate, ufp,
619 sizeof(struct user_fp)) ? -EFAULT : 0; 619 sizeof(struct user_fp)) ? -EFAULT : 0;
@@ -626,7 +626,7 @@ static int ptrace_setfpregs(struct task_struct *tsk, void __user *ufp)
626 */ 626 */
627static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp) 627static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp)
628{ 628{
629 struct thread_info *thread = tsk->thread_info; 629 struct thread_info *thread = task_thread_info(tsk);
630 void *ptr = &thread->fpstate; 630 void *ptr = &thread->fpstate;
631 631
632 if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT)) 632 if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))
@@ -643,7 +643,7 @@ static int ptrace_getwmmxregs(struct task_struct *tsk, void __user *ufp)
643 */ 643 */
644static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp) 644static int ptrace_setwmmxregs(struct task_struct *tsk, void __user *ufp)
645{ 645{
646 struct thread_info *thread = tsk->thread_info; 646 struct thread_info *thread = task_thread_info(tsk);
647 void *ptr = &thread->fpstate; 647 void *ptr = &thread->fpstate;
648 648
649 if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT)) 649 if (!test_ti_thread_flag(thread, TIF_USING_IWMMXT))
@@ -779,7 +779,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
779#endif 779#endif
780 780
781 case PTRACE_GET_THREAD_AREA: 781 case PTRACE_GET_THREAD_AREA:
782 ret = put_user(child->thread_info->tp_value, 782 ret = put_user(task_thread_info(child)->tp_value,
783 (unsigned long __user *) data); 783 (unsigned long __user *) data);
784 break; 784 break;
785 785
diff --git a/include/asm-arm/system.h b/include/asm-arm/system.h
index 0497171df8c9..eb2de8c10515 100644
--- a/include/asm-arm/system.h
+++ b/include/asm-arm/system.h
@@ -168,7 +168,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info
168 168
169#define switch_to(prev,next,last) \ 169#define switch_to(prev,next,last) \
170do { \ 170do { \
171 last = __switch_to(prev,prev->thread_info,next->thread_info); \ 171 last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \
172} while (0) 172} while (0)
173 173
174/* 174/*
diff --git a/include/asm-arm/thread_info.h b/include/asm-arm/thread_info.h
index 7c98557b717f..46a4e9890e58 100644
--- a/include/asm-arm/thread_info.h
+++ b/include/asm-arm/thread_info.h
@@ -100,9 +100,9 @@ extern void free_thread_info(struct thread_info *);
100#define put_thread_info(ti) put_task_struct((ti)->task) 100#define put_thread_info(ti) put_task_struct((ti)->task)
101 101
102#define thread_saved_pc(tsk) \ 102#define thread_saved_pc(tsk) \
103 ((unsigned long)(pc_pointer((tsk)->thread_info->cpu_context.pc))) 103 ((unsigned long)(pc_pointer(task_thread_info(tsk)->cpu_context.pc)))
104#define thread_saved_fp(tsk) \ 104#define thread_saved_fp(tsk) \
105 ((unsigned long)((tsk)->thread_info->cpu_context.fp)) 105 ((unsigned long)(task_thread_info(tsk)->cpu_context.fp))
106 106
107extern void iwmmxt_task_disable(struct thread_info *); 107extern void iwmmxt_task_disable(struct thread_info *);
108extern void iwmmxt_task_copy(struct thread_info *, void *); 108extern void iwmmxt_task_copy(struct thread_info *, void *);