From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758907AbdEWJAp (ORCPT ); Tue, 23 May 2017 05:00:45 -0400 Received: from terminus.zytor.com ([65.50.211.136]:59273 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752923AbdEWJAm (ORCPT ); Tue, 23 May 2017 05:00:42 -0400 Date: Tue, 23 May 2017 01:55:41 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: gregkh@linuxfoundation.org, mgorman@techsingularity.net, mark.rutland@arm.com, mhocko@suse.com, hannes@cmpxchg.org, peterz@infradead.org, mingo@kernel.org, linux-kernel@vger.kernel.org, rostedt@goodmis.org, vbabka@suse.cz, torvalds@linux-foundation.org, tglx@linutronix.de, akpm@linux-foundation.org, hpa@zytor.com Reply-To: tglx@linutronix.de, akpm@linux-foundation.org, hpa@zytor.com, rostedt@goodmis.org, vbabka@suse.cz, torvalds@linux-foundation.org, hannes@cmpxchg.org, peterz@infradead.org, mhocko@suse.com, mingo@kernel.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org, mgorman@techsingularity.net, mark.rutland@arm.com In-Reply-To: <20170516184736.119158930@linutronix.de> References: <20170516184736.119158930@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] mm/vmscan: Adjust system_state checks Git-Commit-ID: c6202adf3a0969514299cf10ff07376a84ad09bb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: c6202adf3a0969514299cf10ff07376a84ad09bb Gitweb: http://git.kernel.org/tip/c6202adf3a0969514299cf10ff07376a84ad09bb Author: Thomas Gleixner AuthorDate: Tue, 16 May 2017 20:42:46 +0200 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 10:01:37 +0200 mm/vmscan: Adjust system_state checks 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. Tested-by: Mark Rutland Signed-off-by: Thomas Gleixner Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Steven Rostedt (VMware) Acked-by: Vlastimil Babka Cc: Andrew Morton Cc: Greg Kroah-Hartman Cc: Johannes Weiner Cc: Linus Torvalds Cc: Mel Gorman Cc: Michal Hocko Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170516184736.119158930@linutronix.de Signed-off-by: Ingo Molnar --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 8ad39bb..c3c1c6a 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3652,7 +3652,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;