]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[POWERPC] Fix DEBUG_PREEMPT warning when warning
authorHugh Dickins <hugh@veritas.com>
Fri, 8 Feb 2008 18:25:13 +0000 (05:25 +1100)
committerPaul Mackerras <paulus@samba.org>
Thu, 14 Feb 2008 11:11:00 +0000 (22:11 +1100)
The powerpc show_regs prints CPU using smp_processor_id: change that to
raw_smp_processor_id, so that when it's showing a WARN_ON backtrace without
preemption disabled, DEBUG_PREEMPT doesn't mess up that warning with its own.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/process.c

index b9d88374f14f07abe21e51367110e6c82129ba99..4846bf543a8c5cf9dd2f95a611c4deae04cd9863 100644 (file)
@@ -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++) {