2 files changed, 3 insertions, 3 deletions

diff --git a/include/asm-arm26/system.h b/include/asm-arm26/system.h
index 1bce6b3590ff..ca4ccfc4b578 100644
--- a/include/asm-arm26/system.h
+++ b/include/asm-arm26/system.h
@@ -111,7 +111,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info
 
 #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 --git a/include/asm-arm26/thread_info.h b/include/asm-arm26/thread_info.h
index aff3e5699c64..909c88dff84d 100644
--- a/include/asm-arm26/thread_info.h
+++ b/include/asm-arm26/thread_info.h
@@ -91,9 +91,9 @@ extern void free_thread_info(struct thread_info *);
 #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__ */