diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:05:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:08:53 -0500 |
commit | cafcfcaa60dbb5bcccbbc1d0ad7d4bdeeb4d0cc8 (patch) | |
tree | a3830f77e0d4de4393ce02fefe401a2edead8746 | |
parent | 3cf0f4ece9f1680e54b154b1e38baaf6ace20a62 (diff) |
[PATCH] sh: task_thread_info()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/sh/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/smp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c index 8c0060ce6c02..35415d0be39e 100644 --- a/arch/sh/kernel/process.c +++ b/arch/sh/kernel/process.c | |||
@@ -342,7 +342,7 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne | |||
342 | */ | 342 | */ |
343 | asm volatile("ldc %0, r7_bank" | 343 | asm volatile("ldc %0, r7_bank" |
344 | : /* no output */ | 344 | : /* no output */ |
345 | : "r" (next->thread_info)); | 345 | : "r" (task_thread_info(next))); |
346 | 346 | ||
347 | #ifdef CONFIG_MMU | 347 | #ifdef CONFIG_MMU |
348 | /* If no tasks are using the UBC, we're done */ | 348 | /* If no tasks are using the UBC, we're done */ |
diff --git a/arch/sh/kernel/smp.c b/arch/sh/kernel/smp.c index 59e49b18252c..62c7d1c0ad7b 100644 --- a/arch/sh/kernel/smp.c +++ b/arch/sh/kernel/smp.c | |||
@@ -103,7 +103,7 @@ int __cpu_up(unsigned int cpu) | |||
103 | if (IS_ERR(tsk)) | 103 | if (IS_ERR(tsk)) |
104 | panic("Failed forking idle task for cpu %d\n", cpu); | 104 | panic("Failed forking idle task for cpu %d\n", cpu); |
105 | 105 | ||
106 | tsk->thread_info->cpu = cpu; | 106 | task_thread_info(tsk)->cpu = cpu; |
107 | 107 | ||
108 | cpu_set(cpu, cpu_online_map); | 108 | cpu_set(cpu, cpu_online_map); |
109 | 109 | ||