From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753418AbbE0OYW (ORCPT ); Wed, 27 May 2015 10:24:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36401 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752863AbbE0OYR (ORCPT ); Wed, 27 May 2015 10:24:17 -0400 Date: Wed, 27 May 2015 07:22:27 -0700 From: tip-bot for Bartosz Golaszewski Message-ID: Cc: rjw@rjwysocki.net, torvalds@linux-foundation.org, oleg.drokin@intel.com, linux@arm.linux.org.uk, bcousson@baylibre.com, viresh.kumar@linaro.org, jdelvare@suse.de, catalin.marinas@arm.com, hpa@zytor.com, linux@roeck-us.net, peterz@infradead.org, fenghua.yu@intel.com, tglx@linutronix.de, mingo@kernel.org, bgolaszewski@baylibre.com, linux-kernel@vger.kernel.org, corbet@lwn.net Reply-To: rjw@rjwysocki.net, torvalds@linux-foundation.org, oleg.drokin@intel.com, linux@arm.linux.org.uk, viresh.kumar@linaro.org, bcousson@baylibre.com, jdelvare@suse.de, catalin.marinas@arm.com, hpa@zytor.com, linux@roeck-us.net, peterz@infradead.org, fenghua.yu@intel.com, tglx@linutronix.de, mingo@kernel.org, bgolaszewski@baylibre.com, linux-kernel@vger.kernel.org, corbet@lwn.net In-Reply-To: <1432645896-12588-5-git-send-email-bgolaszewski@baylibre.com> References: <1432645896-12588-5-git-send-email-bgolaszewski@baylibre.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] powernow-k8: Replace cpu_core_mask() with topology_core_cpumask() Git-Commit-ID: 38c52e6343f0e28abc7daf15cbbcd7e450667202 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: 38c52e6343f0e28abc7daf15cbbcd7e450667202 Gitweb: http://git.kernel.org/tip/38c52e6343f0e28abc7daf15cbbcd7e450667202 Author: Bartosz Golaszewski AuthorDate: Tue, 26 May 2015 15:11:31 +0200 Committer: Ingo Molnar CommitDate: Wed, 27 May 2015 15:22:16 +0200 powernow-k8: Replace cpu_core_mask() with topology_core_cpumask() The former duplicates the functionality of the latter but is 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-5-git-send-email-bgolaszewski@baylibre.com Signed-off-by: Ingo Molnar --- drivers/cpufreq/powernow-k8.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/cpufreq/powernow-k8.c b/drivers/cpufreq/powernow-k8.c index f9ce7e4..5c035d0 100644 --- a/drivers/cpufreq/powernow-k8.c +++ b/drivers/cpufreq/powernow-k8.c @@ -57,13 +57,6 @@ static DEFINE_PER_CPU(struct powernow_k8_data *, powernow_data); static struct cpufreq_driver cpufreq_amd64_driver; -#ifndef CONFIG_SMP -static inline const struct cpumask *cpu_core_mask(int cpu) -{ - return cpumask_of(0); -} -#endif - /* Return a frequency in MHz, given an input fid */ static u32 find_freq_from_fid(u32 fid) { @@ -620,7 +613,7 @@ static int fill_powernow_table(struct powernow_k8_data *data, pr_debug("cfid 0x%x, cvid 0x%x\n", data->currfid, data->currvid); data->powernow_table = powernow_table; - if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu) + if (cpumask_first(topology_core_cpumask(data->cpu)) == data->cpu) print_basics(data); for (j = 0; j < data->numps; j++) @@ -784,7 +777,7 @@ static int powernow_k8_cpu_init_acpi(struct powernow_k8_data *data) CPUFREQ_TABLE_END; data->powernow_table = powernow_table; - if (cpumask_first(cpu_core_mask(data->cpu)) == data->cpu) + if (cpumask_first(topology_core_cpumask(data->cpu)) == data->cpu) print_basics(data); /* notify BIOS that we exist */ @@ -1090,7 +1083,7 @@ static int powernowk8_cpu_init(struct cpufreq_policy *pol) if (rc != 0) goto err_out_exit_acpi; - cpumask_copy(pol->cpus, cpu_core_mask(pol->cpu)); + cpumask_copy(pol->cpus, topology_core_cpumask(pol->cpu)); data->available_cores = pol->cpus; /* min/max the cpu is capable of */