From 0ce300ac0e8e9ed42f0c067c09f0f21526afe7eb Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 12 Jan 2006 01:06:04 -0800 Subject: [PATCH] --- yaml --- r: 18095 b: refs/heads/master c: 718d6114fcd894bf4d3527b9e206a1cbcaaae35d h: refs/heads/master i: 18093: 720f7bce268d0806c34779cd791e205416121f10 18091: 5d1812d132f888dd068608ccf7499fe4d48e6e12 18087: 9426bf815e09fedf1d11c4257f78584c55480c7f 18079: e01e3320b5d4a06f37a6c178b67c88a9d6e62674 v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v32/kernel/process.c | 2 +- trunk/arch/cris/arch-v32/kernel/smp.c | 4 ++-- trunk/arch/cris/arch-v32/mm/tlb.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8ff059124e99..4f4284e2588c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cfa0f29b6da2c4d45ecdeaabe17af4c4adc47c05 +refs/heads/master: 718d6114fcd894bf4d3527b9e206a1cbcaaae35d diff --git a/trunk/arch/cris/arch-v32/kernel/process.c b/trunk/arch/cris/arch-v32/kernel/process.c index e88b13b139d5..843513102d3c 100644 --- a/trunk/arch/cris/arch-v32/kernel/process.c +++ b/trunk/arch/cris/arch-v32/kernel/process.c @@ -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. */ diff --git a/trunk/arch/cris/arch-v32/kernel/smp.c b/trunk/arch/cris/arch-v32/kernel/smp.c index 13867f4fad16..da40d19a151e 100644 --- a/trunk/arch/cris/arch-v32/kernel/smp.c +++ b/trunk/arch/cris/arch-v32/kernel/smp.c @@ -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 */ diff --git a/trunk/arch/cris/arch-v32/mm/tlb.c b/trunk/arch/cris/arch-v32/mm/tlb.c index b08a28bb58ab..9d75d7692303 100644 --- a/trunk/arch/cris/arch-v32/mm/tlb.c +++ b/trunk/arch/cris/arch-v32/mm/tlb.c @@ -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 {