From d3977956eb781266db26f4d1ec19e7b41a4f00b7 Mon Sep 17 00:00:00 2001 From: Matt Evans Date: Mon, 7 Jun 2010 21:38:18 +0000 Subject: [PATCH] --- yaml --- r: 200422 b: refs/heads/master c: b636f1379eefe6eba931deaa386605bc7ac623e7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/machine_kexec_64.c | 18 +----------------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 73d2fd1b0b4e..4618bf7108d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65cf840ff4b63852d34d577d559978ccfc554a6c +refs/heads/master: b636f1379eefe6eba931deaa386605bc7ac623e7 diff --git a/trunk/arch/powerpc/kernel/machine_kexec_64.c b/trunk/arch/powerpc/kernel/machine_kexec_64.c index 26f9900f773c..ed31a29c4ff7 100644 --- a/trunk/arch/powerpc/kernel/machine_kexec_64.c +++ b/trunk/arch/powerpc/kernel/machine_kexec_64.c @@ -182,28 +182,12 @@ static void kexec_prepare_cpus_wait(int wait_state) 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; while (paca[i].kexec_state < wait_state) { barrier(); - if (!cpu_possible(i)) { - printk("kexec: cpu %d hw_cpu_id %d is not" - " possible, ignoring\n", - i, paca[i].hw_cpu_id); - break; - } - if (!cpu_online(i)) { - /* Fixme: this can be spinning in - * pSeries_secondary_wait with a paca - * waiting for it to go online. - */ - printk("kexec: cpu %d hw_cpu_id %d is not" - " online, ignoring\n", - i, paca[i].hw_cpu_id); - break; - } if (i != notified) { printk( "kexec: waiting for cpu %d (physical" " %d) to enter %i state\n",