Merge commit 'paulus-perf/master' into next

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/machine_kexec_64.c
index ed31a29c4ff772cb22bbf038603b4bbd83731888,6c7c546aa1be793b3ae30f9ca0e82f09362aba76..de6b70eac51d1ee742d73fedc836f8445d392779
--- 1/arch/powerpc/kernel/machine_kexec_64.c
--- 2/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@@ -180,9 -182,10 +182,10 @@@ static void kexec_prepare_cpus_wait(in
  {
        int my_cpu, i, notified=-1;
  
+       hw_breakpoint_disable();
        my_cpu = get_cpu();
        /* Make sure each CPU has atleast made it to the state we need */
 -      for (i=0; i < NR_CPUS; i++) {
 +      for_each_online_cpu(i) {
                if (i == my_cpu)
                        continue;
  

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/lib/Makefile
Simple merge