From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933287AbdENShq (ORCPT ); Sun, 14 May 2017 14:37:46 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:58284 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933202AbdENShe (ORCPT ); Sun, 14 May 2017 14:37:34 -0400 Message-Id: <20170514183613.675463242@linutronix.de> User-Agent: quilt/0.63-1 Date: Sun, 14 May 2017 20:27:31 +0200 From: Thomas Gleixner To: LKML Cc: Peter Zijlstra , Ingo Molnar , Steven Rostedt , Mark Rutland , Andrew Morton , Johannes Weiner , Mel Gorman , Michal Hocko , Vlastimil Babka , linux-mm@kvack.org Subject: [patch 15/18] mm/vmscan: Adjust system_state checks References: <20170514182716.347236777@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=mm-vmscan--Adjust-system_state-checks.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To enable smp_processor_id() and might_sleep() debug checks earlier, it's required to add system states between SYSTEM_BOOTING and SYSTEM_RUNNING. Adjust the system_state check in kswapd_run() to handle the extra states. Signed-off-by: Thomas Gleixner Cc: Andrew Morton Cc: Johannes Weiner Cc: Mel Gorman Cc: Michal Hocko Cc: Vlastimil Babka Cc: linux-mm@kvack.org --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3643,7 +3643,7 @@ int kswapd_run(int nid) pgdat->kswapd = kthread_run(kswapd, pgdat, "kswapd%d", nid); if (IS_ERR(pgdat->kswapd)) { /* failure at boot is fatal */ - BUG_ON(system_state == SYSTEM_BOOTING); + BUG_ON(system_state < SYSTEM_RUNNING); pr_err("Failed to start kswapd on node %d\n", nid); ret = PTR_ERR(pgdat->kswapd); pgdat->kswapd = NULL;