android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc/kdump: Fix timeout in crash_kexec_wait_realmode

Browse Source 
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>
Cc: <stable@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Michael Neuling
2011-07-04 20:40:10 +00:00
committed by Benjamin Herrenschmidt
parent f7ba2991e9
commit 63f21a56f1
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/crash.c
View File

@ -242,12 +242,8 @@ static void crash_kexec_wait_realmode(int cpu)
while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) { while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
barrier(); barrier();
if (!cpu_possible(i)) { if (!cpu_possible(i) || !cpu_online(i) || (msecs <= 0))
break; break;
}
if (!cpu_online(i)) {
break;
}
msecs--; msecs--;
mdelay(1); mdelay(1);
} }