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

Commit 06931e62 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Ingo Molnar
Browse files

sched/topology: Rename topology_thread_cpumask() to topology_sibling_cpumask() 



Rename topology_thread_cpumask() to topology_sibling_cpumask()
for more consistency with scheduler code.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Jean Delvare <jdelvare@suse.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Link: http://lkml.kernel.org/r/1432645896-12588-2-git-send-email-bgolaszewski@baylibre.com


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

Documentation/cputopology.txt

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ these macros in include/asm-XXX/topology.h: 
#define topology_physical_package_id(cpu)

#define topology_core_id(cpu)

#define topology_book_id(cpu)

#define topology_thread_cpumask(cpu)

#define topology_sibling_cpumask(cpu)

#define topology_core_cpumask(cpu)

#define topology_book_cpumask(cpu)

arch/arm/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ extern struct cputopo_arm cpu_topology[NR_CPUS]; 
#define topology_physical_package_id(cpu)	(cpu_topology[cpu].socket_id)

#define topology_core_id(cpu)		(cpu_topology[cpu].core_id)

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

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

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



void init_cpu_topology(void);

void store_cpu_topology(unsigned int cpuid);

arch/arm64/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ extern struct cpu_topology cpu_topology[NR_CPUS]; 
#define topology_physical_package_id(cpu)	(cpu_topology[cpu].cluster_id)

#define topology_core_id(cpu)		(cpu_topology[cpu].core_id)

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

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

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



void init_cpu_topology(void);

void store_cpu_topology(unsigned int cpuid);

arch/ia64/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void build_cpu_to_node_map(void); 
#define topology_physical_package_id(cpu)	(cpu_data(cpu)->socket_id)

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

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

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

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

#endif



extern void arch_fix_phys_package_id(int num, u32 slot);

arch/mips/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#define topology_physical_package_id(cpu)	(cpu_data[cpu].package)

#define topology_core_id(cpu)			(cpu_data[cpu].core)

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

#define topology_thread_cpumask(cpu)		(&cpu_sibling_map[cpu])

#define topology_sibling_cpumask(cpu)		(&cpu_sibling_map[cpu])

#endif



#endif /* __ASM_TOPOLOGY_H */