Merge branch 'percpu-for-linus' into percpu-for-next

Conflicts:
	arch/sparc/kernel/smp_64.c
	arch/x86/kernel/cpu/perf_counter.c
	arch/x86/kernel/setup_percpu.c
	drivers/cpufreq/cpufreq_ondemand.c
	mm/percpu.c

Conflicts in core and arch percpu codes are mostly from commit
ed78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many
num_possible_cpus() with nr_cpu_ids.  As for-next branch has moved all
the first chunk allocators into mm/percpu.c, the changes are moved
from arch code to mm/percpu.c.

Signed-off-by: Tejun Heo <tj@kernel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index ba9ab9349782..e64efac3b9db 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -354,10 +354,10 @@ void show_regs(struct pt_regs * regs)
 
         for (i = 0; i < 16; i++) {
                 if ((i % 8) == 0)
-                        printk ("\n" KERN_INFO "a%02d: ", i);
-                printk("%08lx ", regs->areg[i]);
+                        printk(KERN_INFO "a%02d:", i);
+                printk(KERN_CONT " %08lx", regs->areg[i]);
         }
-        printk("\n");
+        printk(KERN_CONT "\n");
 
         printk("pc: %08lx, ps: %08lx, depc: %08lx, excvaddr: %08lx\n",
                regs->pc, regs->ps, regs->depc, regs->excvaddr);