diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:08:58 -0500 |
commit | 718d6114fcd894bf4d3527b9e206a1cbcaaae35d (patch) | |
tree | 3a247a3f9201657ff67735b559984b87ecb1b12f /arch/cris/arch-v32/kernel | |
parent | cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05 (diff) |
[PATCH] cris: 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>
Diffstat (limited to 'arch/cris/arch-v32/kernel')
-rw-r--r-- | arch/cris/arch-v32/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/kernel/smp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/cris/arch-v32/kernel/process.c b/arch/cris/arch-v32/kernel/process.c index e88b13b139d5..843513102d3c 100644 --- a/arch/cris/arch-v32/kernel/process.c +++ b/arch/cris/arch-v32/kernel/process.c | |||
@@ -157,7 +157,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | |||
157 | * The TLS is in $mof beacuse it is the 5th argument to sys_clone. | 157 | * The TLS is in $mof beacuse it is the 5th argument to sys_clone. |
158 | */ | 158 | */ |
159 | if (p->mm && (clone_flags & CLONE_SETTLS)) { | 159 | if (p->mm && (clone_flags & CLONE_SETTLS)) { |
160 | p->thread_info->tls = regs->mof; | 160 | task_thread_info(p)->tls = regs->mof; |
161 | } | 161 | } |
162 | 162 | ||
163 | /* Put the switch stack right below the pt_regs. */ | 163 | /* Put the switch stack right below the pt_regs. */ |
diff --git a/arch/cris/arch-v32/kernel/smp.c b/arch/cris/arch-v32/kernel/smp.c index 13867f4fad16..da40d19a151e 100644 --- a/arch/cris/arch-v32/kernel/smp.c +++ b/arch/cris/arch-v32/kernel/smp.c | |||
@@ -113,10 +113,10 @@ smp_boot_one_cpu(int cpuid) | |||
113 | if (IS_ERR(idle)) | 113 | if (IS_ERR(idle)) |
114 | panic("SMP: fork failed for CPU:%d", cpuid); | 114 | panic("SMP: fork failed for CPU:%d", cpuid); |
115 | 115 | ||
116 | idle->thread_info->cpu = cpuid; | 116 | task_thread_info(idle)->cpu = cpuid; |
117 | 117 | ||
118 | /* Information to the CPU that is about to boot */ | 118 | /* Information to the CPU that is about to boot */ |
119 | smp_init_current_idle_thread = idle->thread_info; | 119 | smp_init_current_idle_thread = task_thread_info(idle); |
120 | cpu_now_booting = cpuid; | 120 | cpu_now_booting = cpuid; |
121 | 121 | ||
122 | /* Wait for CPU to come online */ | 122 | /* Wait for CPU to come online */ |