[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-c6202adf3a0969514299cf10ff07376a84ad09bb@git.kernel.org>
Date: Tue, 23 May 2017 01:55:41 -0700
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: gregkh@...uxfoundation.org, mgorman@...hsingularity.net,
mark.rutland@....com, mhocko@...e.com, hannes@...xchg.org,
peterz@...radead.org, mingo@...nel.org,
linux-kernel@...r.kernel.org, rostedt@...dmis.org, vbabka@...e.cz,
torvalds@...ux-foundation.org, tglx@...utronix.de,
akpm@...ux-foundation.org, hpa@...or.com
Subject: [tip:sched/core] mm/vmscan: Adjust system_state checks
Commit-ID: c6202adf3a0969514299cf10ff07376a84ad09bb
Gitweb: http://git.kernel.org/tip/c6202adf3a0969514299cf10ff07376a84ad09bb
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Tue, 16 May 2017 20:42:46 +0200
Committer: Ingo Molnar <mingo@...nel.org>
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 <mark.rutland@....com>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Reviewed-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
Acked-by: Vlastimil Babka <vbabka@...e.cz>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
Cc: Johannes Weiner <hannes@...xchg.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Mel Gorman <mgorman@...hsingularity.net>
Cc: Michal Hocko <mhocko@...e.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Link: http://lkml.kernel.org/r/20170516184736.119158930@linutronix.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
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;
Powered by blists - more mailing lists