From: Al Viro Signed-off-by: Al Viro Signed-off-by: Andrew Morton --- arch/powerpc/kernel/process.c | 4 ++-- arch/powerpc/kernel/ptrace-common.h | 4 ++-- arch/powerpc/kernel/smp.c | 6 +++--- arch/powerpc/platforms/cell/smp.c | 2 +- arch/powerpc/platforms/pseries/smp.c | 2 +- arch/ppc/kernel/process.c | 2 +- arch/ppc/kernel/smp.c | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff -puN arch/powerpc/kernel/process.c~powerpc-task_thread_info arch/powerpc/kernel/process.c --- devel/arch/powerpc/kernel/process.c~powerpc-task_thread_info 2006-01-04 22:02:54.000000000 -0800 +++ devel-akpm/arch/powerpc/kernel/process.c 2006-01-04 22:02:54.000000000 -0800 @@ -424,7 +424,7 @@ void show_regs(struct pt_regs * regs) if (trap == 0x300 || trap == 0x600) printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); printk("TASK = %p[%d] '%s' THREAD: %p", - current, current->pid, current->comm, current->thread_info); + current, current->pid, current->comm, task_thread_info(current)); #ifdef CONFIG_SMP printk(" CPU: %d", smp_processor_id()); @@ -516,7 +516,7 @@ int copy_thread(int nr, unsigned long cl #ifdef CONFIG_PPC32 childregs->gpr[2] = (unsigned long) p; #else - clear_ti_thread_flag(p->thread_info, TIF_32BIT); + clear_tsk_thread_flag(p, TIF_32BIT); #endif p->thread.regs = NULL; /* no user register state */ } else { diff -puN arch/powerpc/kernel/ptrace-common.h~powerpc-task_thread_info arch/powerpc/kernel/ptrace-common.h --- devel/arch/powerpc/kernel/ptrace-common.h~powerpc-task_thread_info 2006-01-04 22:02:54.000000000 -0800 +++ devel-akpm/arch/powerpc/kernel/ptrace-common.h 2006-01-04 22:02:54.000000000 -0800 @@ -62,7 +62,7 @@ static inline void set_single_step(struc struct pt_regs *regs = task->thread.regs; if (regs != NULL) regs->msr |= MSR_SE; - set_ti_thread_flag(task->thread_info, TIF_SINGLESTEP); + set_tsk_thread_flag(task, TIF_SINGLESTEP); } static inline void clear_single_step(struct task_struct *task) @@ -70,7 +70,7 @@ static inline void clear_single_step(str struct pt_regs *regs = task->thread.regs; if (regs != NULL) regs->msr &= ~MSR_SE; - clear_ti_thread_flag(task->thread_info, TIF_SINGLESTEP); + clear_tsk_thread_flag(task, TIF_SINGLESTEP); } #ifdef CONFIG_ALTIVEC diff -puN arch/powerpc/kernel/smp.c~powerpc-task_thread_info arch/powerpc/kernel/smp.c --- devel/arch/powerpc/kernel/smp.c~powerpc-task_thread_info 2006-01-04 22:02:54.000000000 -0800 +++ devel-akpm/arch/powerpc/kernel/smp.c 2006-01-04 22:02:54.000000000 -0800 @@ -338,8 +338,8 @@ static void __init smp_create_idle(unsig #ifdef CONFIG_PPC64 paca[cpu].__current = p; #endif - current_set[cpu] = p->thread_info; - p->thread_info->cpu = cpu; + current_set[cpu] = task_thread_info(p); + task_thread_info(p)->cpu = cpu; } void __init smp_prepare_cpus(unsigned int max_cpus) @@ -375,7 +375,7 @@ void __devinit smp_prepare_boot_cpu(void #ifdef CONFIG_PPC64 paca[boot_cpuid].__current = current; #endif - current_set[boot_cpuid] = current->thread_info; + current_set[boot_cpuid] = task_thread_info(current); } #ifdef CONFIG_HOTPLUG_CPU diff -puN arch/powerpc/platforms/cell/smp.c~powerpc-task_thread_info arch/powerpc/platforms/cell/smp.c --- devel/arch/powerpc/platforms/cell/smp.c~powerpc-task_thread_info 2006-01-04 22:02:54.000000000 -0800 +++ devel-akpm/arch/powerpc/platforms/cell/smp.c 2006-01-04 22:02:54.000000000 -0800 @@ -86,7 +86,7 @@ static inline int __devinit smp_startup_ pcpu = get_hard_smp_processor_id(lcpu); /* Fixup atomic count: it exited inside IRQ handler. */ - paca[lcpu].__current->thread_info->preempt_count = 0; + task_thread_info(paca[lcpu].__current)->preempt_count = 0; /* * If the RTAS start-cpu token does not exist then presume the diff -puN arch/powerpc/platforms/pseries/smp.c~powerpc-task_thread_info arch/powerpc/platforms/pseries/smp.c --- devel/arch/powerpc/platforms/pseries/smp.c~powerpc-task_thread_info 2006-01-04 22:02:54.000000000 -0800 +++ devel-akpm/arch/powerpc/platforms/pseries/smp.c 2006-01-04 22:02:54.000000000 -0800 @@ -282,7 +282,7 @@ static inline int __devinit smp_startup_ pcpu = get_hard_smp_processor_id(lcpu); /* Fixup atomic count: it exited inside IRQ handler. */ - paca[lcpu].__current->thread_info->preempt_count = 0; + task_thread_info(paca[lcpu].__current)->preempt_count = 0; /* * If the RTAS start-cpu token does not exist then presume the diff -puN arch/ppc/kernel/process.c~powerpc-task_thread_info arch/ppc/kernel/process.c --- devel/arch/ppc/kernel/process.c~powerpc-task_thread_info 2006-01-04 22:02:54.000000000 -0800 +++ devel-akpm/arch/ppc/kernel/process.c 2006-01-04 22:02:54.000000000 -0800 @@ -384,7 +384,7 @@ void show_regs(struct pt_regs * regs) if (trap == 0x300 || trap == 0x600) printk("DAR: %08lX, DSISR: %08lX\n", regs->dar, regs->dsisr); printk("TASK = %p[%d] '%s' THREAD: %p\n", - current, current->pid, current->comm, current->thread_info); + current, current->pid, current->comm, task_thread_info(current)); printk("Last syscall: %ld ", current->thread.last_syscall); #ifdef CONFIG_SMP diff -puN arch/ppc/kernel/smp.c~powerpc-task_thread_info arch/ppc/kernel/smp.c --- devel/arch/ppc/kernel/smp.c~powerpc-task_thread_info 2006-01-04 22:02:54.000000000 -0800 +++ devel-akpm/arch/ppc/kernel/smp.c 2006-01-04 22:02:54.000000000 -0800 @@ -318,7 +318,7 @@ void __init smp_prepare_cpus(unsigned in p = fork_idle(cpu); if (IS_ERR(p)) panic("failed fork for CPU %u: %li", cpu, PTR_ERR(p)); - p->thread_info->cpu = cpu; + task_thread_info(p)->cpu = cpu; idle_tasks[cpu] = p; } } @@ -369,7 +369,7 @@ int __cpu_up(unsigned int cpu) char buf[32]; int c; - secondary_ti = idle_tasks[cpu]->thread_info; + secondary_ti = task_thread_info(idle_tasks[cpu]); mb(); /* _