Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686AbdLBDej (ORCPT ); Fri, 1 Dec 2017 22:34:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54146 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751202AbdLBDei (ORCPT ); Fri, 1 Dec 2017 22:34:38 -0500 Date: Sat, 2 Dec 2017 11:34:30 +0800 From: Dave Young To: tglx@linutronix.de, bp@suse.de, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-efi@vger.kernel.org Subject: [PATCH] fix system_state checking in early_ioremap Message-ID: <20171202033430.GA2619@dhcp-128-65.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.1 (2017-09-22) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Sat, 02 Dec 2017 03:34:38 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 875 Lines: 24 Since below commit earlyprintk=efi,keep does not work any more with a warning in mm/early_ioremap.c: WARN_ON(system_state >= SYSTEM_RUNNING): commit 69a78ff226fe ("init: Introduce SYSTEM_SCHEDULING state") Reason is the the original assumption is SYSTEM_BOOTING equal to system_state < SYSTEM_RUNNING. But with commit 69a78ff226fe it is not true any more. Change the WARN_ON to check system_state >= SYSTEM_RUNNING instead. Signed-off-by: Dave Young --- mm/early_ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux-x86.orig/mm/early_ioremap.c +++ linux-x86/mm/early_ioremap.c @@ -111,7 +111,7 @@ __early_ioremap(resource_size_t phys_add 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++) {