Commit 35d57884 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull early_ioremap fix from Ingo Molnar:
 "A boot hang fix when the EFI earlyprintk driver is enabled"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  mm/early_ioremap: Fix boot hang with earlyprintk=efi,keep
parents bde6b37e 7f6f60a1
...@@ -111,7 +111,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot) ...@@ -111,7 +111,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
enum fixed_addresses idx; enum fixed_addresses idx;
int i, slot; int i, slot;
WARN_ON(system_state != SYSTEM_BOOTING); WARN_ON(system_state >= SYSTEM_RUNNING);
slot = -1; slot = -1;
for (i = 0; i < FIX_BTMAPS_SLOTS; i++) { for (i = 0; i < FIX_BTMAPS_SLOTS; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment