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

Commit 36fc5500 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Ingo Molnar
Browse files

sched: Remove unused mc_capable() and smt_capable() 



Remove mc_capable() and smt_capable().  Neither is used.

Both were added by 5c45bf27 ("sched: mc/smt power savings sched
policy").  Uses of both were removed by 8e7fbcbc ("sched: Remove stale
power aware scheduling remnants and dysfunctional knobs").

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Link: http://lkml.kernel.org/r/20140304210737.16893.54289.stgit@bhelgaas-glaptop.roam.corp.google.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 156654f4

arch/arm/include/asm/topology.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -20,9 +20,6 @@ extern struct cputopo_arm cpu_topology[NR_CPUS]; 
#define topology_core_cpumask(cpu)	(&cpu_topology[cpu].core_sibling)

#define topology_core_cpumask(cpu)	(&cpu_topology[cpu].core_sibling)

#define topology_thread_cpumask(cpu)	(&cpu_topology[cpu].thread_sibling)

#define topology_thread_cpumask(cpu)	(&cpu_topology[cpu].thread_sibling)





#define mc_capable()	(cpu_topology[0].socket_id != -1)

#define smt_capable()	(cpu_topology[0].thread_id != -1)



void init_cpu_topology(void);

void init_cpu_topology(void);

void store_cpu_topology(unsigned int cpuid);

void store_cpu_topology(unsigned int cpuid);

const struct cpumask *cpu_coregroup_mask(int cpu);

const struct cpumask *cpu_coregroup_mask(int cpu);

arch/ia64/include/asm/topology.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,6 @@ void build_cpu_to_node_map(void); 
#define topology_core_id(cpu)			(cpu_data(cpu)->core_id)

#define topology_core_id(cpu)			(cpu_data(cpu)->core_id)

#define topology_core_cpumask(cpu)		(&cpu_core_map[cpu])

#define topology_core_cpumask(cpu)		(&cpu_core_map[cpu])

#define topology_thread_cpumask(cpu)		(&per_cpu(cpu_sibling_map, cpu))

#define topology_thread_cpumask(cpu)		(&per_cpu(cpu_sibling_map, cpu))

#define smt_capable() 				(smp_num_siblings > 1)

#endif

#endif





extern void arch_fix_phys_package_id(int num, u32 slot);

extern void arch_fix_phys_package_id(int num, u32 slot);

arch/mips/include/asm/topology.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -10,8 +10,4 @@ 




#include <topology.h>

#include <topology.h>





#ifdef CONFIG_SMP

#define smt_capable()	(smp_num_siblings > 1)

#endif



#endif /* __ASM_TOPOLOGY_H */
 
#endif /* __ASM_TOPOLOGY_H */

arch/powerpc/include/asm/topology.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -99,7 +99,6 @@ static inline int prrn_is_enabled(void) 




#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

#include <asm/cputable.h>

#include <asm/cputable.h>

#define smt_capable()		(cpu_has_feature(CPU_FTR_SMT))





#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC64

#include <asm/smp.h>

#include <asm/smp.h>

arch/sparc/include/asm/topology_64.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -42,8 +42,6 @@ static inline int pcibus_to_node(struct pci_bus *pbus) 
#define topology_core_id(cpu)			(cpu_data(cpu).core_id)

#define topology_core_id(cpu)			(cpu_data(cpu).core_id)

#define topology_core_cpumask(cpu)		(&cpu_core_map[cpu])

#define topology_core_cpumask(cpu)		(&cpu_core_map[cpu])

#define topology_thread_cpumask(cpu)		(&per_cpu(cpu_sibling_map, cpu))

#define topology_thread_cpumask(cpu)		(&per_cpu(cpu_sibling_map, cpu))

#define mc_capable()				(sparc64_multi_core)

#define smt_capable()				(sparc64_multi_core)

#endif /* CONFIG_SMP */

#endif /* CONFIG_SMP */





extern cpumask_t cpu_core_map[NR_CPUS];

extern cpumask_t cpu_core_map[NR_CPUS];