[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>

authored by Al Viro and committed by Linus Torvalds 718d6114 cfa0f29b

+5 -5
+1 -1
arch/cris/arch-v32/kernel/process.c
··· 157 * The TLS is in $mof beacuse it is the 5th argument to sys_clone. 158 */ 159 if (p->mm && (clone_flags & CLONE_SETTLS)) { 160 - p->thread_info->tls = regs->mof; 161 } 162 163 /* Put the switch stack right below the pt_regs. */
··· 157 * The TLS is in $mof beacuse it is the 5th argument to sys_clone. 158 */ 159 if (p->mm && (clone_flags & CLONE_SETTLS)) { 160 + task_thread_info(p)->tls = regs->mof; 161 } 162 163 /* Put the switch stack right below the pt_regs. */
+2 -2
arch/cris/arch-v32/kernel/smp.c
··· 113 if (IS_ERR(idle)) 114 panic("SMP: fork failed for CPU:%d", cpuid); 115 116 - idle->thread_info->cpu = cpuid; 117 118 /* Information to the CPU that is about to boot */ 119 - smp_init_current_idle_thread = idle->thread_info; 120 cpu_now_booting = cpuid; 121 122 /* Wait for CPU to come online */
··· 113 if (IS_ERR(idle)) 114 panic("SMP: fork failed for CPU:%d", cpuid); 115 116 + task_thread_info(idle)->cpu = cpuid; 117 118 /* Information to the CPU that is about to boot */ 119 + smp_init_current_idle_thread = task_thread_info(idle); 120 cpu_now_booting = cpuid; 121 122 /* Wait for CPU to come online */
+2 -2
arch/cris/arch-v32/mm/tlb.c
··· 198 per_cpu(current_pgd, cpu) = next->pgd; 199 200 /* Switch context in the MMU. */ 201 - if (tsk && tsk->thread_info) 202 { 203 - SPEC_REG_WR(SPEC_REG_PID, next->context.page_id | tsk->thread_info->tls); 204 } 205 else 206 {
··· 198 per_cpu(current_pgd, cpu) = next->pgd; 199 200 /* Switch context in the MMU. */ 201 + if (tsk && task_thread_info(tsk)) 202 { 203 + SPEC_REG_WR(SPEC_REG_PID, next->context.page_id | task_thread_info(tsk)->tls); 204 } 205 else 206 {