---

yaml --- r: 18067 b: refs/heads/master c: cafcfca h: refs/heads/master i: 18065: 46f4ef8 18063: 5249f15 v: v3
git-mirror · Jan 12, 2006 · 268eb58 · 268eb58
1 parent e3c7f83
commit 268eb58
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);