From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 9 Jul 2010 01:25:48 +0000 (+1000)
Subject: Merge commit 'paulus-perf/master' into next
X-Git-Tag: v2.6.36-rc1~559^2~47
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5f07aa7524e98d6f68f2bec54f155ef6012e2c9a;p=linux.git

Merge commit 'paulus-perf/master' into next
---

5f07aa7524e98d6f68f2bec54f155ef6012e2c9a
diff --cc arch/powerpc/kernel/machine_kexec_64.c
index ed31a29c4ff7,6c7c546aa1be..de6b70eac51d
--- a/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;