Commit 960d447b authored May 26, 2015 by Bartosz Golaszewski Committed by Ingo Molnar May 27, 2015

x86: Remove cpu_sibling_mask() and cpu_core_mask()



These functions are arch-specific and duplicate the
functionality of macros defined in linux/include/topology.h.

Remove them as all the callers in x86 have now switched to using
the topology_**_cpumask() family.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Benoit Cousson <bcousson@baylibre.com>
Cc: Catalin Marinas <catalin.marinas@arm.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-10-git-send-email-bgolaszewski@baylibre.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 7d79a7bd

arch/x86/include/asm/smp.h

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -37,16 +37,6 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
	DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);		DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
	DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);		DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);

	static inline struct cpumask *cpu_sibling_mask(int cpu)
	{
	return per_cpu(cpu_sibling_map, cpu);
	}

	static inline struct cpumask *cpu_core_mask(int cpu)
	{
	return per_cpu(cpu_core_map, cpu);
	}

	static inline struct cpumask *cpu_llc_shared_mask(int cpu)		static inline struct cpumask *cpu_llc_shared_mask(int cpu)
	{		{
	return per_cpu(cpu_llc_shared_map, cpu);		return per_cpu(cpu_llc_shared_map, cpu);