提交 63f21a56 编写于 作者: M Michael Neuling 提交者: Benjamin Herrenschmidt

powerpc/kdump: Fix timeout in crash_kexec_wait_realmode

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: NAnton Blanchard <anton@samba.org>
Signed-off-by: NMichael Neuling <mikey@neuling.org>
Cc: <stable@kernel.org>
Signed-off-by: NBenjamin Herrenschmidt <benh@kernel.crashing.org>
上级 f7ba2991
......@@ -242,12 +242,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);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册