[GIT PULL] mm/early_ioremap.c, earlyprintk fix

From: Ingo Molnar
Date: Fri Dec 15 2017 - 10:18:27 EST


Linus,

Please pull the latest core-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus

# HEAD: 7f6f60a1ba52538c16f26930bfbcfe193d9d746a mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep

A boot hang fix when the EFI earlyprintk driver is enabled.

Thanks,

Ingo

------------------>
Dave Young (1):
mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep


mm/early_ioremap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/early_ioremap.c b/mm/early_ioremap.c
index d04ac1ec0559..1826f191e72c 100644
--- a/mm/early_ioremap.c
+++ b/mm/early_ioremap.c
@@ -111,7 +111,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
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++) {