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/microblaze/mm/init.c b/arch/microblaze/mm/init.c
index b5a701cd71e0..8d92c4efe9a4 100644
--- a/arch/microblaze/mm/init.c
+++ b/arch/microblaze/mm/init.c
@@ -80,15 +80,15 @@ void __init setup_memory(void)
                         memory_size = memory_end - memory_start;
                         PAGE_OFFSET = memory_start;
                         printk(KERN_INFO "%s: Main mem: 0x%x-0x%x, "
-                                "size 0x%08x\n", __func__, memory_start,
-                                                memory_end, memory_size);
+                                "size 0x%08x\n", __func__, (u32) memory_start,
+                                        (u32) memory_end, (u32) memory_size);
                         break;
                 }
         }
 
         if (!memory_start || !memory_end) {
                 panic("%s: Missing memory setting 0x%08x-0x%08x\n",
-                        __func__, memory_start, memory_end);
+                        __func__, (u32) memory_start, (u32) memory_end);
         }
 
         /* reservation of region where is the kernel */