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, 8 insertions, 5 deletions

diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c
index 6e3d491184ea..b91b2044af9c 100644
--- a/arch/avr32/kernel/traps.c
+++ b/arch/avr32/kernel/traps.c
@@ -32,22 +32,25 @@ void NORET_TYPE die(const char *str, struct pt_regs *regs, long err)
         spin_lock_irq(&die_lock);
         bust_spinlocks(1);
 
-        printk(KERN_ALERT "Oops: %s, sig: %ld [#%d]\n" KERN_EMERG,
+        printk(KERN_ALERT "Oops: %s, sig: %ld [#%d]\n",
                str, err, ++die_counter);
+
+        printk(KERN_EMERG);
+
 #ifdef CONFIG_PREEMPT
-        printk("PREEMPT ");
+        printk(KERN_CONT "PREEMPT ");
 #endif
 #ifdef CONFIG_FRAME_POINTER
-        printk("FRAME_POINTER ");
+        printk(KERN_CONT "FRAME_POINTER ");
 #endif
         if (current_cpu_data.features & AVR32_FEATURE_OCD) {
                 unsigned long did = ocd_read(DID);
-                printk("chip: 0x%03lx:0x%04lx rev %lu\n",
+                printk(KERN_CONT "chip: 0x%03lx:0x%04lx rev %lu\n",
                        (did >> 1) & 0x7ff,
                        (did >> 12) & 0x7fff,
                        (did >> 28) & 0xf);
         } else {
-                printk("cpu: arch %u r%u / core %u r%u\n",
+                printk(KERN_CONT "cpu: arch %u r%u / core %u r%u\n",
                        current_cpu_data.arch_type,
                        current_cpu_data.arch_revision,
                        current_cpu_data.cpu_type,