From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932189AbdLOPSY (ORCPT ); Fri, 15 Dec 2017 10:18:24 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:44208 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932085AbdLOPSV (ORCPT ); Fri, 15 Dec 2017 10:18:21 -0500 X-Google-Smtp-Source: ACJfBou9kpUOxa6obw0e7R4P3MkwYjoFYJI8Z3FQCE+5UkiPdduOdjpkTnImfEUoFvEyrO1xckRbpw== Date: Fri, 15 Dec 2017 16:18:17 +0100 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Peter Zijlstra , Andrew Morton Subject: [GIT PULL] mm/early_ioremap.c, earlyprintk fix Message-ID: <20171215151817.ibai7l2ytystqszg@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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++) {