From 268eb5810b8d013cac2ece438a9ac2ef8b11c632 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 12 Jan 2006 01:05:45 -0800
Subject: [PATCH] --- yaml --- r: 18067 b: refs/heads/master c:
 cafcfcaa60dbb5bcccbbc1d0ad7d4bdeeb4d0cc8 h: refs/heads/master i:   18065:
 46f4ef87604015f1b68e4c6c8e00ef5b19b08879   18063:
 5249f159c93a655f694953721819d9e44eadab86 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sh/kernel/process.c | 2 +-
 trunk/arch/sh/kernel/smp.c     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6703da714d64..a067711f3637 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cf0f4ece9f1680e54b154b1e38baaf6ace20a62
+refs/heads/master: cafcfcaa60dbb5bcccbbc1d0ad7d4bdeeb4d0cc8
diff --git a/trunk/arch/sh/kernel/process.c b/trunk/arch/sh/kernel/process.c
index 8c0060ce6c02..35415d0be39e 100644
--- a/trunk/arch/sh/kernel/process.c
+++ b/trunk/arch/sh/kernel/process.c
@@ -342,7 +342,7 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne
 	 */
 	asm volatile("ldc	%0, r7_bank"
 		     : /* no output */
-		     : "r" (next->thread_info));
+		     : "r" (task_thread_info(next)));
 
 #ifdef CONFIG_MMU
 	/* If no tasks are using the UBC, we're done */
diff --git a/trunk/arch/sh/kernel/smp.c b/trunk/arch/sh/kernel/smp.c
index 59e49b18252c..62c7d1c0ad7b 100644
--- a/trunk/arch/sh/kernel/smp.c
+++ b/trunk/arch/sh/kernel/smp.c
@@ -103,7 +103,7 @@ int __cpu_up(unsigned int cpu)
 	if (IS_ERR(tsk))
 		panic("Failed forking idle task for cpu %d\n", cpu);
 	
-	tsk->thread_info->cpu = cpu;
+	task_thread_info(tsk)->cpu = cpu;
 
 	cpu_set(cpu, cpu_online_map);