iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] powerpc: task_thread_info()

Browse Source 
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>
This commit is contained in:
Al Viro 2006-01-12 01:06:01 -08:00 committed by Linus Torvalds
parent ee8c1dd443
commit b5e2fc1c62
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/process.c
View File

@ -424,7 +424,7 @@ void show_regs(struct pt_regs * regs)
if (trap == 0x300 || trap == 0x600) if (trap == 0x300 || trap == 0x600)
printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr);
printk("TASK = %p[%d] '%s' THREAD: %p", 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 #ifdef CONFIG_SMP
printk(" CPU: %d", smp_processor_id()); printk(" CPU: %d", smp_processor_id());
@ -516,7 +516,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
childregs->gpr[2] = (unsigned long) p; childregs->gpr[2] = (unsigned long) p;
#else #else
clear_ti_thread_flag(p->thread_info, TIF_32BIT); clear_tsk_thread_flag(p, TIF_32BIT);
#endif #endif
p->thread.regs = NULL; /* no user register state */ p->thread.regs = NULL; /* no user register state */
} else { } else {

4
arch/powerpc/kernel/ptrace-common.h
View File

@ -62,7 +62,7 @@ static inline void set_single_step(struct task_struct *task)
struct pt_regs *regs = task->thread.regs; struct pt_regs *regs = task->thread.regs;
if (regs != NULL) if (regs != NULL)
regs->msr |= MSR_SE; 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) static inline void clear_single_step(struct task_struct *task)
@ -70,7 +70,7 @@ static inline void clear_single_step(struct task_struct *task)
struct pt_regs *regs = task->thread.regs; struct pt_regs *regs = task->thread.regs;
if (regs != NULL) if (regs != NULL)
regs->msr &= ~MSR_SE; regs->msr &= ~MSR_SE;
clear_ti_thread_flag(task->thread_info, TIF_SINGLESTEP); clear_tsk_thread_flag(task, TIF_SINGLESTEP);
} }
#ifdef CONFIG_ALTIVEC #ifdef CONFIG_ALTIVEC

6
arch/powerpc/kernel/smp.c
View File

@ -338,8 +338,8 @@ static void __init smp_create_idle(unsigned int cpu)
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
paca[cpu].__current = p; paca[cpu].__current = p;
#endif #endif
current_set[cpu] = p->thread_info; current_set[cpu] = task_thread_info(p);
p->thread_info->cpu = cpu; task_thread_info(p)->cpu = cpu;
} }
void __init smp_prepare_cpus(unsigned int max_cpus) void __init smp_prepare_cpus(unsigned int max_cpus)
@ -375,7 +375,7 @@ void __devinit smp_prepare_boot_cpu(void)
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
paca[boot_cpuid].__current = current; paca[boot_cpuid].__current = current;
#endif #endif
current_set[boot_cpuid] = current->thread_info; current_set[boot_cpuid] = task_thread_info(current);
} }
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU

2
arch/powerpc/platforms/cell/smp.c
View File

@ -86,7 +86,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
pcpu = get_hard_smp_processor_id(lcpu); pcpu = get_hard_smp_processor_id(lcpu);
/* Fixup atomic count: it exited inside IRQ handler. */ /* 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 * If the RTAS start-cpu token does not exist then presume the

2
arch/powerpc/platforms/pseries/smp.c
View File

@ -282,7 +282,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
pcpu = get_hard_smp_processor_id(lcpu); pcpu = get_hard_smp_processor_id(lcpu);
/* Fixup atomic count: it exited inside IRQ handler. */ /* 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 * If the RTAS start-cpu token does not exist then presume the

2
arch/ppc/kernel/process.c
View File

@ -384,7 +384,7 @@ void show_regs(struct pt_regs * regs)
if (trap == 0x300 || trap == 0x600) if (trap == 0x300 || trap == 0x600)
printk("DAR: %08lX, DSISR: %08lX\n", regs->dar, regs->dsisr); printk("DAR: %08lX, DSISR: %08lX\n", regs->dar, regs->dsisr);
printk("TASK = %p[%d] '%s' THREAD: %p\n", 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); printk("Last syscall: %ld ", current->thread.last_syscall);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP

4
arch/ppc/kernel/smp.c
View File

@ -318,7 +318,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
p = fork_idle(cpu); p = fork_idle(cpu);
if (IS_ERR(p)) if (IS_ERR(p))
panic("failed fork for CPU %u: %li", cpu, PTR_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; idle_tasks[cpu] = p;
} }
} }
@ -369,7 +369,7 @@ int __cpu_up(unsigned int cpu)
char buf[32]; char buf[32];
int c; int c;
secondary_ti = idle_tasks[cpu]->thread_info; secondary_ti = task_thread_info(idle_tasks[cpu]);
mb(); mb();
/* /*