mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
sched: Create proper cpu_$DOM_mask() functions
In order to unify the sched domain creation more, create proper cpu_$DOM_mask() functions for those domains that didn't already have one. Use the sched_domains_tmpmask for the weird NUMA domain span. Signed-off-by: Peter Zijlstra <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Nick Piggin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Andrew Morton <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
parent
4cb988395d
commit
d3081f52f2
1 changed files with 17 additions and 5 deletions
|
|
@ -6807,8 +6807,22 @@ static void sched_domain_node_span(int node, struct cpumask *span)
|
|||
cpumask_or(span, span, cpumask_of_node(next_node));
|
||||
}
|
||||
}
|
||||
|
||||
static const struct cpumask *cpu_node_mask(int cpu)
|
||||
{
|
||||
lockdep_assert_held(&sched_domains_mutex);
|
||||
|
||||
sched_domain_node_span(cpu_to_node(cpu), sched_domains_tmpmask);
|
||||
|
||||
return sched_domains_tmpmask;
|
||||
}
|
||||
#endif /* CONFIG_NUMA */
|
||||
|
||||
static const struct cpumask *cpu_cpu_mask(int cpu)
|
||||
{
|
||||
return cpumask_of_node(cpu_to_node(cpu));
|
||||
}
|
||||
|
||||
int sched_smt_power_savings = 0, sched_mc_power_savings = 0;
|
||||
|
||||
struct sd_data {
|
||||
|
|
@ -7088,7 +7102,7 @@ static struct sched_domain *__build_allnodes_sched_domain(struct s_data *d,
|
|||
#ifdef CONFIG_NUMA
|
||||
sd = sd_init_ALLNODES(d, i);
|
||||
set_domain_attribute(sd, attr);
|
||||
cpumask_copy(sched_domain_span(sd), cpu_map);
|
||||
cpumask_and(sched_domain_span(sd), cpu_map, cpu_possible_mask);
|
||||
sd->parent = parent;
|
||||
if (parent)
|
||||
parent->child = sd;
|
||||
|
|
@ -7104,8 +7118,7 @@ static struct sched_domain *__build_node_sched_domain(struct s_data *d,
|
|||
#ifdef CONFIG_NUMA
|
||||
sd = sd_init_NODE(d, i);
|
||||
set_domain_attribute(sd, attr);
|
||||
sched_domain_node_span(cpu_to_node(i), sched_domain_span(sd));
|
||||
cpumask_and(sched_domain_span(sd), sched_domain_span(sd), cpu_map);
|
||||
cpumask_and(sched_domain_span(sd), cpu_map, cpu_node_mask(i));
|
||||
sd->parent = parent;
|
||||
if (parent)
|
||||
parent->child = sd;
|
||||
|
|
@ -7120,8 +7133,7 @@ static struct sched_domain *__build_cpu_sched_domain(struct s_data *d,
|
|||
struct sched_domain *sd;
|
||||
sd = sd_init_CPU(d, i);
|
||||
set_domain_attribute(sd, attr);
|
||||
cpumask_and(sched_domain_span(sd),
|
||||
cpumask_of_node(cpu_to_node(i)), cpu_map);
|
||||
cpumask_and(sched_domain_span(sd), cpu_map, cpu_cpu_mask(i));
|
||||
sd->parent = parent;
|
||||
if (parent)
|
||||
parent->child = sd;
|
||||
|
|
|
|||
Loading…
Reference in a new issue