Messages in this thread Patch in this message | | | Date | Wed, 27 May 2015 07:24:02 -0700 | From | tip-bot for Bartosz Golaszewski <> | Subject | [tip:sched/core] x86: Remove cpu_sibling_mask() and cpu_core_mask () |
| |
Commit-ID: 960d447b94b22ceba286917056871d1dac8da697 Gitweb: http://git.kernel.org/tip/960d447b94b22ceba286917056871d1dac8da697 Author: Bartosz Golaszewski <bgolaszewski@baylibre.com> AuthorDate: Tue, 26 May 2015 15:11:36 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Wed, 27 May 2015 15:22:17 +0200
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> --- arch/x86/include/asm/smp.h | 10 ---------- 1 file changed, 10 deletions(-)
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 17a8dce..222a6a3 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h @@ -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(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) { return per_cpu(cpu_llc_shared_map, cpu);
| |