diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-02-15 13:36:30 -0500 |
| commit | 52833e897fd8c6f62b3e5e27291fa9bc803f7460 (patch) | |
| tree | cfe90047ee6c7402674a29ec7258319142b96ff1 /arch/powerpc/kernel/process.c | |
| parent | 8d042218b075de3cdbe066198515b3521553746e (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
Merge branch 'linus_origin' into hotfixes
Diffstat (limited to 'arch/powerpc/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index b9d88374f14f..4846bf543a8c 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
| @@ -462,7 +462,7 @@ void show_regs(struct pt_regs * regs) | |||
| 462 | current, task_pid_nr(current), current->comm, task_thread_info(current)); | 462 | current, task_pid_nr(current), current->comm, task_thread_info(current)); |
| 463 | 463 | ||
| 464 | #ifdef CONFIG_SMP | 464 | #ifdef CONFIG_SMP |
| 465 | printk(" CPU: %d", smp_processor_id()); | 465 | printk(" CPU: %d", raw_smp_processor_id()); |
| 466 | #endif /* CONFIG_SMP */ | 466 | #endif /* CONFIG_SMP */ |
| 467 | 467 | ||
| 468 | for (i = 0; i < 32; i++) { | 468 | for (i = 0; i < 32; i++) { |