hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2017-12-15 11:34:29 -08:00
parent bde6b37e49 7f6f60a1ba
commit 35d5788480
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/early_ioremap.c
View File

@ -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++) {