Skip to content

Commit

Permalink
[PATCH] cris: task_thread_info()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jan 12, 2006
1 parent cfa0f29 commit 718d611
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/cris/arch-v32/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
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. */
Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v32/kernel/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ smp_boot_one_cpu(int cpuid)
if (IS_ERR(idle))
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 */
smp_init_current_idle_thread = idle->thread_info;
smp_init_current_idle_thread = task_thread_info(idle);
cpu_now_booting = cpuid;

/* Wait for CPU to come online */
Expand Down
4 changes: 2 additions & 2 deletions arch/cris/arch-v32/mm/tlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next,
per_cpu(current_pgd, cpu) = next->pgd;

/* 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
{
Expand Down

0 comments on commit 718d611

Please sign in to comment.