From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1425945AbcFHOWf (ORCPT ); Wed, 8 Jun 2016 10:22:35 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34228 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423120AbcFHOWd (ORCPT ); Wed, 8 Jun 2016 10:22:33 -0400 Date: Wed, 8 Jun 2016 07:21:53 -0700 From: tip-bot for Josh Poimboeuf Message-ID: Cc: srikar@linux.vnet.ibm.com, torvalds@linux-foundation.org, matt@codeblueprint.co.uk, jpoimboe@redhat.com, mgorman@techsingularity.net, hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org Reply-To: peterz@infradead.org, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, mgorman@techsingularity.net, jpoimboe@redhat.com, matt@codeblueprint.co.uk, torvalds@linux-foundation.org, srikar@linux.vnet.ibm.com In-Reply-To: <5b1b04057ae2b14d73c2d03f56582c1d38cfe066.1464994423.git.jpoimboe@redhat.com> References: <5b1b04057ae2b14d73c2d03f56582c1d38cfe066.1464994423.git.jpoimboe@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/debug: Always show 'nr_migrations' Git-Commit-ID: 03c041c5bf6ed584dff36b7cd509e0146a124277 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: 03c041c5bf6ed584dff36b7cd509e0146a124277 Gitweb: http://git.kernel.org/tip/03c041c5bf6ed584dff36b7cd509e0146a124277 Author: Josh Poimboeuf AuthorDate: Fri, 3 Jun 2016 17:58:41 -0500 Committer: Ingo Molnar CommitDate: Wed, 8 Jun 2016 14:34:49 +0200 sched/debug: Always show 'nr_migrations' The nr_migrations field is updated independently of CONFIG_SCHEDSTATS, so it can be displayed regardless. Signed-off-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) Acked-by: Mel Gorman Cc: Linus Torvalds Cc: Matt Fleming Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/5b1b04057ae2b14d73c2d03f56582c1d38cfe066.1464994423.git.jpoimboe@redhat.com Signed-off-by: Ingo Molnar --- kernel/sched/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c index 0368c39..2a0a999 100644 --- a/kernel/sched/debug.c +++ b/kernel/sched/debug.c @@ -879,9 +879,9 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) nr_switches = p->nvcsw + p->nivcsw; -#ifdef CONFIG_SCHEDSTATS P(se.nr_migrations); +#ifdef CONFIG_SCHEDSTATS if (schedstat_enabled()) { u64 avg_atom, avg_per_cpu;