diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-15 11:34:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-15 11:34:29 -0800 |
| commit | 35d57884804ca45bfbf7590933066547050f5786 (patch) | |
| tree | 4ecd04c52f4eff0dce4b40c447783d81e5acff4c /mm | |
| parent | bde6b37e49831d0a6452c39ce2b53662afec78af (diff) | |
| parent | 7f6f60a1ba52538c16f26930bfbcfe193d9d746a (diff) | |
| download | linux-35d57884804ca45bfbf7590933066547050f5786.tar.gz linux-35d57884804ca45bfbf7590933066547050f5786.tar.bz2 linux-35d57884804ca45bfbf7590933066547050f5786.zip | |
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
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/early_ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
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++) { |