Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f269893c authored by Heiko Carstens's avatar Heiko Carstens Committed by Ingo Molnar
Browse files

sched: Merge cpu_to_core_group functions 



Merge and simplify the two cpu_to_core_group variants so that the
resulting function follows the same pattern like cpu_to_phys_group.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20100831082843.953617555@de.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ed2d372c

kernel/sched.c

+5 −13
Original line number Diff line number Diff line
@@ -6552,31 +6552,23 @@ cpu_to_cpu_group(int cpu, const struct cpumask *cpu_map, 
#ifdef CONFIG_SCHED_MC

static DEFINE_PER_CPU(struct static_sched_domain, core_domains);

static DEFINE_PER_CPU(struct static_sched_group, sched_group_core);

#endif /* CONFIG_SCHED_MC */



#if defined(CONFIG_SCHED_MC) && defined(CONFIG_SCHED_SMT)

static int

cpu_to_core_group(int cpu, const struct cpumask *cpu_map,

		  struct sched_group **sg, struct cpumask *mask)

{

	int group;



#ifdef CONFIG_SCHED_SMT

	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);

	group = cpumask_first(mask);

#else

	group = cpu;

#endif

	if (sg)

		*sg = &per_cpu(sched_group_core, group).sg;

	return group;

}

#elif defined(CONFIG_SCHED_MC)

static int

cpu_to_core_group(int cpu, const struct cpumask *cpu_map,

		  struct sched_group **sg, struct cpumask *unused)

{

	if (sg)

		*sg = &per_cpu(sched_group_core, cpu).sg;

	return cpu;

}

#endif

#endif /* CONFIG_SCHED_MC */



static DEFINE_PER_CPU(struct static_sched_domain, phys_domains);

static DEFINE_PER_CPU(struct static_sched_group, sched_group_phys);