linux-kernel - [tip:sched/core] powernow-k8: Replace cpu_core_mask() with topology_core

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-38c52e6343f0e28abc7daf15cbbcd7e450667202@git.kernel.org>
Date:	Wed, 27 May 2015 07:22:27 -0700
From:	tip-bot for Bartosz Golaszewski <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	rjw@...ysocki.net, torvalds@...ux-foundation.org,
	oleg.drokin@...el.com, linux@....linux.org.uk,
	bcousson@...libre.com, viresh.kumar@...aro.org, jdelvare@...e.de,
	catalin.marinas@....com, hpa@...or.com, linux@...ck-us.net,
	peterz@...radead.org, fenghua.yu@...el.com, tglx@...utronix.de,
	mingo@...nel.org, bgolaszewski@...libre.com,
	linux-kernel@...r.kernel.org, corbet@....net
Subject: [tip:sched/core] powernow-k8: Replace cpu_core_mask()
  with topology_core_cpumask()

Commit-ID:  38c52e6343f0e28abc7daf15cbbcd7e450667202
Gitweb:     http://git.kernel.org/tip/38c52e6343f0e28abc7daf15cbbcd7e450667202
Author:     Bartosz Golaszewski <bgolaszewski@...libre.com>
AuthorDate: Tue, 26 May 2015 15:11:31 +0200
Committer:  Ingo Molnar <mingo@...nel.org>
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 <bgolaszewski@...libre.com>
Acked-by: Viresh Kumar <viresh.kumar@...aro.org>
Acked-by: Rafael J. Wysocki <rjw@...ysocki.net>
Cc: Benoit Cousson <bcousson@...libre.com>
Cc: Catalin Marinas <catalin.marinas@....com>
Cc: Fenghua Yu <fenghua.yu@...el.com>
Cc: Guenter Roeck <linux@...ck-us.net>
Cc: Jean Delvare <jdelvare@...e.de>
Cc: Jonathan Corbet <corbet@....net>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Oleg Drokin <oleg.drokin@...el.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Russell King <linux@....linux.org.uk>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/1432645896-12588-5-git-send-email-bgolaszewski@baylibre.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 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 */
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/