[PATCH resend] fix boot hang with earlyprintk=efi,keep

From: Dave Young
Date: Fri Dec 08 2017 - 23:16:34 EST


earlyprintk=efi,keep does not work any more with a warning
in mm/early_ioremap.c: WARN_ON(system_state != SYSTEM_BOOTING):
Boot just hangs because of the earlyprintk within earlyprintk
implementation code.

This is caused by a new introduced middle state in below commit:
commit 69a78ff226fe ("init: Introduce SYSTEM_SCHEDULING state")
early_ioremap is fine in both SYSTEM_BOOTING and SYSTEM_SCHEDULING
states, original condition should be updated accordingly.

Signed-off-by: Dave Young <dyoung@xxxxxxxxxx>
---
v1->v2: update patch log correct some typos
mm/early_ioremap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-x86.orig/mm/early_ioremap.c
+++ linux-x86/mm/early_ioremap.c
@@ -111,7 +111,7 @@ __early_ioremap(resource_size_t phys_add
enum fixed_addresses idx;
int i, slot;

- WARN_ON(system_state != SYSTEM_BOOTING);
+ WARN_ON(system_state >= SYSTEM_RUNNING);

slot = -1;
for (i = 0; i < FIX_BTMAPS_SLOTS; i++) {