diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:08:57 -0500 |
commit | b5e2fc1c6259e6f26bc4ae4de697da1f8da0edec (patch) | |
tree | a30c0c897bd0b6e529b6ef760f6bd44775cfb7d3 /arch/powerpc/kernel | |
parent | ee8c1dd44305cca9d0ded248de991f67b55ec622 (diff) |
[PATCH] powerpc: task_thread_info()
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>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/process.c | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/ptrace-common.h | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/smp.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 105d5609ff57..bc03526d25de 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
@@ -424,7 +424,7 @@ void show_regs(struct pt_regs * regs) | |||
424 | if (trap == 0x300 || trap == 0x600) | 424 | if (trap == 0x300 || trap == 0x600) |
425 | printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); | 425 | printk("DAR: "REG", DSISR: "REG"\n", regs->dar, regs->dsisr); |
426 | printk("TASK = %p[%d] '%s' THREAD: %p", | 426 | printk("TASK = %p[%d] '%s' THREAD: %p", |
427 | current, current->pid, current->comm, current->thread_info); | 427 | current, current->pid, current->comm, task_thread_info(current)); |
428 | 428 | ||
429 | #ifdef CONFIG_SMP | 429 | #ifdef CONFIG_SMP |
430 | printk(" CPU: %d", smp_processor_id()); | 430 | printk(" CPU: %d", smp_processor_id()); |
@@ -516,7 +516,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | |||
516 | #ifdef CONFIG_PPC32 | 516 | #ifdef CONFIG_PPC32 |
517 | childregs->gpr[2] = (unsigned long) p; | 517 | childregs->gpr[2] = (unsigned long) p; |
518 | #else | 518 | #else |
519 | clear_ti_thread_flag(p->thread_info, TIF_32BIT); | 519 | clear_tsk_thread_flag(p, TIF_32BIT); |
520 | #endif | 520 | #endif |
521 | p->thread.regs = NULL; /* no user register state */ | 521 | p->thread.regs = NULL; /* no user register state */ |
522 | } else { | 522 | } else { |
diff --git a/arch/powerpc/kernel/ptrace-common.h b/arch/powerpc/kernel/ptrace-common.h index b1babb729673..5ccbdbe0d5c9 100644 --- a/arch/powerpc/kernel/ptrace-common.h +++ b/arch/powerpc/kernel/ptrace-common.h | |||
@@ -62,7 +62,7 @@ static inline void set_single_step(struct task_struct *task) | |||
62 | struct pt_regs *regs = task->thread.regs; | 62 | struct pt_regs *regs = task->thread.regs; |
63 | if (regs != NULL) | 63 | if (regs != NULL) |
64 | regs->msr |= MSR_SE; | 64 | regs->msr |= MSR_SE; |
65 | set_ti_thread_flag(task->thread_info, TIF_SINGLESTEP); | 65 | set_tsk_thread_flag(task, TIF_SINGLESTEP); |
66 | } | 66 | } |
67 | 67 | ||
68 | static inline void clear_single_step(struct task_struct *task) | 68 | static inline void clear_single_step(struct task_struct *task) |
@@ -70,7 +70,7 @@ static inline void clear_single_step(struct task_struct *task) | |||
70 | struct pt_regs *regs = task->thread.regs; | 70 | struct pt_regs *regs = task->thread.regs; |
71 | if (regs != NULL) | 71 | if (regs != NULL) |
72 | regs->msr &= ~MSR_SE; | 72 | regs->msr &= ~MSR_SE; |
73 | clear_ti_thread_flag(task->thread_info, TIF_SINGLESTEP); | 73 | clear_tsk_thread_flag(task, TIF_SINGLESTEP); |
74 | } | 74 | } |
75 | 75 | ||
76 | #ifdef CONFIG_ALTIVEC | 76 | #ifdef CONFIG_ALTIVEC |
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c index d381ec90b759..c8458c531b25 100644 --- a/arch/powerpc/kernel/smp.c +++ b/arch/powerpc/kernel/smp.c | |||
@@ -338,8 +338,8 @@ static void __init smp_create_idle(unsigned int cpu) | |||
338 | #ifdef CONFIG_PPC64 | 338 | #ifdef CONFIG_PPC64 |
339 | paca[cpu].__current = p; | 339 | paca[cpu].__current = p; |
340 | #endif | 340 | #endif |
341 | current_set[cpu] = p->thread_info; | 341 | current_set[cpu] = task_thread_info(p); |
342 | p->thread_info->cpu = cpu; | 342 | task_thread_info(p)->cpu = cpu; |
343 | } | 343 | } |
344 | 344 | ||
345 | void __init smp_prepare_cpus(unsigned int max_cpus) | 345 | void __init smp_prepare_cpus(unsigned int max_cpus) |
@@ -375,7 +375,7 @@ void __devinit smp_prepare_boot_cpu(void) | |||
375 | #ifdef CONFIG_PPC64 | 375 | #ifdef CONFIG_PPC64 |
376 | paca[boot_cpuid].__current = current; | 376 | paca[boot_cpuid].__current = current; |
377 | #endif | 377 | #endif |
378 | current_set[boot_cpuid] = current->thread_info; | 378 | current_set[boot_cpuid] = task_thread_info(current); |
379 | } | 379 | } |
380 | 380 | ||
381 | #ifdef CONFIG_HOTPLUG_CPU | 381 | #ifdef CONFIG_HOTPLUG_CPU |