From: tip-bot for Srikar Dronamraju <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: riel@redhat.com, srikar@linux.vnet.ibm.com, mingo@kernel.org,
hpa@zytor.com, efault@gmx.de, mgorman@suse.de,
tglx@linutronix.de, peterz@infradead.org,
linux-kernel@vger.kernel.org, torvalds@linux-foundation.org
Subject: [tip:sched/core] sched/numa: Rename numabalancing_enabled to sched_numa_balancing
Date: Sun, 13 Sep 2015 04:01:55 -0700 [thread overview]
Message-ID: <tip-78a9c54649ea220065aad9902460a1d137c7eafd@git.kernel.org> (raw)
In-Reply-To: <1439290813-6683-2-git-send-email-srikar@linux.vnet.ibm.com>
Commit-ID: 78a9c54649ea220065aad9902460a1d137c7eafd
Gitweb: http://git.kernel.org/tip/78a9c54649ea220065aad9902460a1d137c7eafd
Author: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
AuthorDate: Tue, 11 Aug 2015 16:30:11 +0530
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sun, 13 Sep 2015 09:52:52 +0200
sched/numa: Rename numabalancing_enabled to sched_numa_balancing
Simple rename of the 'numabalancing_enabled' variable to 'sched_numa_balancing'.
No functional changes.
Suggested-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1439290813-6683-2-git-send-email-srikar@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
kernel/sched/core.c | 6 +++---
kernel/sched/fair.c | 4 ++--
kernel/sched/sched.h | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 37ab6f9..2656af0 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2124,11 +2124,11 @@ void set_numabalancing_state(bool enabled)
sched_feat_set("NO_NUMA");
}
#else
-__read_mostly bool numabalancing_enabled;
+__read_mostly bool sched_numa_balancing;
void set_numabalancing_state(bool enabled)
{
- numabalancing_enabled = enabled;
+ sched_numa_balancing = enabled;
}
#endif /* CONFIG_SCHED_DEBUG */
@@ -2138,7 +2138,7 @@ int sysctl_numa_balancing(struct ctl_table *table, int write,
{
struct ctl_table t;
int err;
- int state = numabalancing_enabled;
+ int state = sched_numa_balancing;
if (write && !capable(CAP_SYS_ADMIN))
return -EPERM;
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 36774e5..3a6ac55 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -2069,7 +2069,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
int local = !!(flags & TNF_FAULT_LOCAL);
int priv;
- if (!numabalancing_enabled)
+ if (!sched_numa_balancing)
return;
/* for example, ksmd faulting in a user's mm */
@@ -7874,7 +7874,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)
entity_tick(cfs_rq, se, queued);
}
- if (numabalancing_enabled)
+ if (sched_numa_balancing)
task_tick_numa(rq, curr);
}
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 637d5ae..d0b303d 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1006,13 +1006,13 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];
#ifdef CONFIG_NUMA_BALANCING
#define sched_feat_numa(x) sched_feat(x)
#ifdef CONFIG_SCHED_DEBUG
-#define numabalancing_enabled sched_feat_numa(NUMA)
+#define sched_numa_balancing sched_feat_numa(NUMA)
#else
-extern bool numabalancing_enabled;
+extern bool sched_numa_balancing;
#endif /* CONFIG_SCHED_DEBUG */
#else
#define sched_feat_numa(x) (0)
-#define numabalancing_enabled (0)
+#define sched_numa_balancing (0)
#endif /* CONFIG_NUMA_BALANCING */
static inline u64 global_rt_period(void)
next prev parent reply other threads:[~2015-09-13 11:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-11 11:00 [PATCH v2 0/3] Disable sched_numa_balancing on uma systems Srikar Dronamraju
2015-08-11 11:00 ` [PATCH v2 1/3] sched/numa: Rename numabalancing_enabled to sched_numa_balancing Srikar Dronamraju
2015-09-13 11:01 ` tip-bot for Srikar Dronamraju [this message]
2015-08-11 11:00 ` [PATCH v2 2/3] sched/numa: Disable sched_numa_balancing on uma systems Srikar Dronamraju
2015-09-13 11:02 ` [tip:sched/core] sched/numa: Disable sched_numa_balancing on UMA systems tip-bot for Srikar Dronamraju
2015-08-11 11:00 ` [PATCH v2 3/3] sched/numa: Remove NUMA sched feature Srikar Dronamraju
2015-08-11 11:15 ` Peter Zijlstra
2015-09-13 11:02 ` [tip:sched/core] sched/numa: Remove the NUMA sched_feature tip-bot for Srikar Dronamraju
2015-08-11 16:24 ` [PATCH v2 4/4] sched/numa: Convert sched_numa_balancing to a static_branch Srikar Dronamraju
2015-09-06 4:01 ` Wanpeng Li
2015-09-07 4:10 ` Srikar Dronamraju
2015-09-07 5:21 ` Wanpeng Li
2015-09-13 11:03 ` [tip:sched/core] " tip-bot for Srikar Dronamraju
2015-09-02 9:33 ` [PATCH v2 0/3] Disable sched_numa_balancing on uma systems Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-78a9c54649ea220065aad9902460a1d137c7eafd@git.kernel.org \
--to=tipbot@zytor.com \
--cc=efault@gmx.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=srikar@linux.vnet.ibm.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).