diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-15 08:48:28 -0800 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-15 08:48:28 -0800 |
| commit | 6f157c1d268d5888ca44c589dccd01729c4172f6 (patch) | |
| tree | e439df35a39c06df3665ec30b406406f08e82177 /arch/powerpc/kernel/process.c | |
| parent | c5974932c1e8514d3478573bb52beebeb2c786dd (diff) | |
| parent | 4ee29f6a52158cea526b16a44ae38643946103ec (diff) | |
| download | kernel-crypto-6f157c1d268d5888ca44c589dccd01729c4172f6.tar.gz kernel-crypto-6f157c1d268d5888ca44c589dccd01729c4172f6.tar.xz kernel-crypto-6f157c1d268d5888ca44c589dccd01729c4172f6.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 b9d88374f14..4846bf543a8 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -462,7 +462,7 @@ void show_regs(struct pt_regs * regs) current, task_pid_nr(current), current->comm, task_thread_info(current)); #ifdef CONFIG_SMP - printk(" CPU: %d", smp_processor_id()); + printk(" CPU: %d", raw_smp_processor_id()); #endif /* CONFIG_SMP */ for (i = 0; i < 32; i++) { |