Skip to content

Commit

Permalink
sched/numa: Rename numabalancing_enabled to sched_numa_balancing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Srikar Dronamraju authored and Ingo Molnar committed Sep 13, 2015
1 parent c5afb6a commit 78a9c54
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions kernel/sched/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions kernel/sched/fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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);
}

Expand Down
6 changes: 3 additions & 3 deletions kernel/sched/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 78a9c54

Please sign in to comment.