From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753457AbbE0OZF (ORCPT ); Wed, 27 May 2015 10:25:05 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36455 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753014AbbE0OZC (ORCPT ); Wed, 27 May 2015 10:25:02 -0400 Date: Wed, 27 May 2015 07:23:04 -0700 From: tip-bot for Bartosz Golaszewski Message-ID: Cc: bgolaszewski@baylibre.com, rjw@rjwysocki.net, catalin.marinas@arm.com, fenghua.yu@intel.com, linux@roeck-us.net, peterz@infradead.org, linux-kernel@vger.kernel.org, corbet@lwn.net, tglx@linutronix.de, oleg.drokin@intel.com, jdelvare@suse.de, mingo@kernel.org, viresh.kumar@linaro.org, bcousson@baylibre.com, linux@arm.linux.org.uk, torvalds@linux-foundation.org, hpa@zytor.com Reply-To: mingo@kernel.org, viresh.kumar@linaro.org, bcousson@baylibre.com, linux@arm.linux.org.uk, hpa@zytor.com, torvalds@linux-foundation.org, oleg.drokin@intel.com, jdelvare@suse.de, peterz@infradead.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, corbet@lwn.net, bgolaszewski@baylibre.com, rjw@rjwysocki.net, catalin.marinas@arm.com, fenghua.yu@intel.com, linux@roeck-us.net In-Reply-To: <1432645896-12588-7-git-send-email-bgolaszewski@baylibre.com> References: <1432645896-12588-7-git-send-email-bgolaszewski@baylibre.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] acpi-cpufreq: Replace cpu_**_mask() with topology_**_cpumask() Git-Commit-ID: 3280c3c84d003b2dd37a788a4a6225a909c2d3e1 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: 3280c3c84d003b2dd37a788a4a6225a909c2d3e1 Gitweb: http://git.kernel.org/tip/3280c3c84d003b2dd37a788a4a6225a909c2d3e1 Author: Bartosz Golaszewski AuthorDate: Tue, 26 May 2015 15:11:33 +0200 Committer: Ingo Molnar CommitDate: Wed, 27 May 2015 15:22:16 +0200 acpi-cpufreq: Replace cpu_**_mask() with topology_**_cpumask() The former duplicate the functionalities of the latter but are neither documented nor arch-independent. Signed-off-by: Bartosz Golaszewski Acked-by: Viresh Kumar Acked-by: Rafael J. Wysocki 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: Russell King Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1432645896-12588-7-git-send-email-bgolaszewski@baylibre.com Signed-off-by: Ingo Molnar --- drivers/cpufreq/acpi-cpufreq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index b0c18ed..0136dfc 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -699,13 +699,14 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy) dmi_check_system(sw_any_bug_dmi_table); if (bios_with_sw_any_bug && !policy_is_shared(policy)) { policy->shared_type = CPUFREQ_SHARED_TYPE_ALL; - cpumask_copy(policy->cpus, cpu_core_mask(cpu)); + cpumask_copy(policy->cpus, topology_core_cpumask(cpu)); } if (check_amd_hwpstate_cpu(cpu) && !acpi_pstate_strict) { cpumask_clear(policy->cpus); cpumask_set_cpu(cpu, policy->cpus); - cpumask_copy(data->freqdomain_cpus, cpu_sibling_mask(cpu)); + cpumask_copy(data->freqdomain_cpus, + topology_sibling_cpumask(cpu)); policy->shared_type = CPUFREQ_SHARED_TYPE_HW; pr_info_once(PFX "overriding BIOS provided _PSD data\n"); }