From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753484AbbE0OZ4 (ORCPT ); Wed, 27 May 2015 10:25:56 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36482 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752405AbbE0OZx (ORCPT ); Wed, 27 May 2015 10:25:53 -0400 Date: Wed, 27 May 2015 07:24:02 -0700 From: tip-bot for Bartosz Golaszewski Message-ID: Cc: rjw@rjwysocki.net, corbet@lwn.net, mingo@kernel.org, bgolaszewski@baylibre.com, linux-kernel@vger.kernel.org, catalin.marinas@arm.com, jdelvare@suse.de, linux@arm.linux.org.uk, torvalds@linux-foundation.org, fenghua.yu@intel.com, tglx@linutronix.de, bcousson@baylibre.com, linux@roeck-us.net, peterz@infradead.org, viresh.kumar@linaro.org, oleg.drokin@intel.com, hpa@zytor.com Reply-To: tglx@linutronix.de, fenghua.yu@intel.com, torvalds@linux-foundation.org, linux@arm.linux.org.uk, catalin.marinas@arm.com, jdelvare@suse.de, bcousson@baylibre.com, bgolaszewski@baylibre.com, mingo@kernel.org, rjw@rjwysocki.net, corbet@lwn.net, linux-kernel@vger.kernel.org, oleg.drokin@intel.com, viresh.kumar@linaro.org, peterz@infradead.org, hpa@zytor.com, linux@roeck-us.net In-Reply-To: <1432645896-12588-10-git-send-email-bgolaszewski@baylibre.com> References: <1432645896-12588-10-git-send-email-bgolaszewski@baylibre.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] x86: Remove cpu_sibling_mask() and cpu_core_mask () Git-Commit-ID: 960d447b94b22ceba286917056871d1dac8da697 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 960d447b94b22ceba286917056871d1dac8da697 Gitweb: http://git.kernel.org/tip/960d447b94b22ceba286917056871d1dac8da697 Author: Bartosz Golaszewski AuthorDate: Tue, 26 May 2015 15:11:36 +0200 Committer: Ingo Molnar 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 Reviewed-by: Thomas Gleixner Cc: Benoit Cousson Cc: Catalin Marinas Cc: Fenghua Yu Cc: Guenter Roeck Cc: Jean Delvare Cc: Jonathan Corbet Cc: Linus Torvalds Cc: Oleg Drokin Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Russell King Cc: Viresh Kumar Link: http://lkml.kernel.org/r/1432645896-12588-10-git-send-email-bgolaszewski@baylibre.com Signed-off-by: Ingo Molnar --- 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);