Commit 718d6114 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

[PATCH] cris: task_thread_info()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cfa0f29b
...@@ -157,7 +157,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp, ...@@ -157,7 +157,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
* The TLS is in $mof beacuse it is the 5th argument to sys_clone. * The TLS is in $mof beacuse it is the 5th argument to sys_clone.
*/ */
if (p->mm && (clone_flags & CLONE_SETTLS)) { if (p->mm && (clone_flags & CLONE_SETTLS)) {
p->thread_info->tls = regs->mof; task_thread_info(p)->tls = regs->mof;
} }
/* Put the switch stack right below the pt_regs. */ /* Put the switch stack right below the pt_regs. */
......
...@@ -113,10 +113,10 @@ smp_boot_one_cpu(int cpuid) ...@@ -113,10 +113,10 @@ smp_boot_one_cpu(int cpuid)
if (IS_ERR(idle)) if (IS_ERR(idle))
panic("SMP: fork failed for CPU:%d", cpuid); panic("SMP: fork failed for CPU:%d", cpuid);
idle->thread_info->cpu = cpuid; task_thread_info(idle)->cpu = cpuid;
/* Information to the CPU that is about to boot */ /* Information to the CPU that is about to boot */
smp_init_current_idle_thread = idle->thread_info; smp_init_current_idle_thread = task_thread_info(idle);
cpu_now_booting = cpuid; cpu_now_booting = cpuid;
/* Wait for CPU to come online */ /* Wait for CPU to come online */
......
...@@ -198,9 +198,9 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, ...@@ -198,9 +198,9 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
per_cpu(current_pgd, cpu) = next->pgd; per_cpu(current_pgd, cpu) = next->pgd;
/* Switch context in the MMU. */ /* Switch context in the MMU. */
if (tsk && tsk->thread_info) if (tsk && task_thread_info(tsk))
{ {
SPEC_REG_WR(SPEC_REG_PID, next->context.page_id | tsk->thread_info->tls); SPEC_REG_WR(SPEC_REG_PID, next->context.page_id | task_thread_info(tsk)->tls);
} }
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment