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/ppc/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/ppc/kernel')
-rw-r--r-- | arch/ppc/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/ppc/kernel/smp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/ppc/kernel/process.c b/arch/ppc/kernel/process.c index 25cbdc8d2941..c3555a8f2c8d 100644 --- a/arch/ppc/kernel/process.c +++ b/arch/ppc/kernel/process.c | |||
@@ -384,7 +384,7 @@ void show_regs(struct pt_regs * regs) | |||
384 | if (trap == 0x300 || trap == 0x600) | 384 | if (trap == 0x300 || trap == 0x600) |
385 | printk("DAR: %08lX, DSISR: %08lX\n", regs->dar, regs->dsisr); | 385 | printk("DAR: %08lX, DSISR: %08lX\n", regs->dar, regs->dsisr); |
386 | printk("TASK = %p[%d] '%s' THREAD: %p\n", | 386 | printk("TASK = %p[%d] '%s' THREAD: %p\n", |
387 | current, current->pid, current->comm, current->thread_info); | 387 | current, current->pid, current->comm, task_thread_info(current)); |
388 | printk("Last syscall: %ld ", current->thread.last_syscall); | 388 | printk("Last syscall: %ld ", current->thread.last_syscall); |
389 | 389 | ||
390 | #ifdef CONFIG_SMP | 390 | #ifdef CONFIG_SMP |
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c index becbfa397556..e55cdda6149a 100644 --- a/arch/ppc/kernel/smp.c +++ b/arch/ppc/kernel/smp.c | |||
@@ -318,7 +318,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
318 | p = fork_idle(cpu); | 318 | p = fork_idle(cpu); |
319 | if (IS_ERR(p)) | 319 | if (IS_ERR(p)) |
320 | panic("failed fork for CPU %u: %li", cpu, PTR_ERR(p)); | 320 | panic("failed fork for CPU %u: %li", cpu, PTR_ERR(p)); |
321 | p->thread_info->cpu = cpu; | 321 | task_thread_info(p)->cpu = cpu; |
322 | idle_tasks[cpu] = p; | 322 | idle_tasks[cpu] = p; |
323 | } | 323 | } |
324 | } | 324 | } |
@@ -369,7 +369,7 @@ int __cpu_up(unsigned int cpu) | |||
369 | char buf[32]; | 369 | char buf[32]; |
370 | int c; | 370 | int c; |
371 | 371 | ||
372 | secondary_ti = idle_tasks[cpu]->thread_info; | 372 | secondary_ti = task_thread_info(idle_tasks[cpu]); |
373 | mb(); | 373 | mb(); |
374 | 374 | ||
375 | /* | 375 | /* |