| From b328bb69529781ac144c66c6ad47cba491436a86 Mon Sep 17 00:00:00 2001 |
| From: Michael Neuling <mikey@neuling.org> |
| Date: Mon, 4 Jul 2011 20:40:10 +0000 |
| Subject: [PATCH] powerpc/kdump: Fix timeout in crash_kexec_wait_realmode |
| |
| commit 63f21a56f1cc0b800a4c00349c59448f82473d19 upstream. |
| |
| The existing code it pretty ugly. How about we clean it up even more |
| like this? |
| |
| From: Anton Blanchard <anton@samba.org> |
| |
| We check for timeout expiry in the outer loop, but we also need to |
| check it in the inner loop or we can lock up forever waiting for a |
| CPU to hit real mode. |
| |
| Signed-off-by: Anton Blanchard <anton@samba.org> |
| Signed-off-by: Michael Neuling <mikey@neuling.org> |
| Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| arch/powerpc/kernel/crash.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c |
| index ddf1fea..d2f619b 100644 |
| --- a/arch/powerpc/kernel/crash.c |
| +++ b/arch/powerpc/kernel/crash.c |
| @@ -176,12 +176,8 @@ static void crash_kexec_wait_realmode(int cpu) |
| |
| while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) { |
| barrier(); |
| - if (!cpu_possible(i)) { |
| + if (!cpu_possible(i) || !cpu_online(i) || (msecs <= 0)) |
| break; |
| - } |
| - if (!cpu_online(i)) { |
| - break; |
| - } |
| msecs--; |
| mdelay(1); |
| } |
| -- |
| 1.7.9.6 |
| |
