[PATCH 2/3] arm,integrator: replace old cpumask functions with new one.

KOSAKI Motohiro kosaki.motohiro at jp.fujitsu.com
Thu Jun 23 04:30:26 EDT 2011


We plant to change task->cpus_allowed implementation in future.
Therefore this patch replace it with tsk_cpus_allowed() helper
macro.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: Russell King <linux at arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas at arm.com>
Cc: linux-arm-kernel at lists.infradead.org
---
 arch/arm/mach-integrator/cpu.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-integrator/cpu.c b/arch/arm/mach-integrator/cpu.c
index fbb4577..de7c0ea 100644
--- a/arch/arm/mach-integrator/cpu.c
+++ b/arch/arm/mach-integrator/cpu.c
@@ -92,13 +92,13 @@ static int integrator_set_target(struct cpufreq_policy *policy,
 	/*
 	 * Save this threads cpus_allowed mask.
 	 */
-	cpus_allowed = current->cpus_allowed;
+	cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));

 	/*
 	 * Bind to the specified CPU.  When this call returns,
 	 * we should be running on the right CPU.
 	 */
-	set_cpus_allowed(current, cpumask_of_cpu(cpu));
+	set_cpus_allowed_ptr(current, cpumask_of(cpu));
 	BUG_ON(cpu != smp_processor_id());

 	/* get current setting */
@@ -126,7 +126,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
 	freqs.cpu = policy->cpu;

 	if (freqs.old == freqs.new) {
-		set_cpus_allowed(current, cpus_allowed);
+		set_cpus_allowed_ptr(current, &cpus_allowed);
 		return 0;
 	}

@@ -149,7 +149,7 @@ static int integrator_set_target(struct cpufreq_policy *policy,
 	/*
 	 * Restore the CPUs allowed mask.
 	 */
-	set_cpus_allowed(current, cpus_allowed);
+	set_cpus_allowed_ptr(current, &cpus_allowed);

 	cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

@@ -163,9 +163,9 @@ static unsigned int integrator_get(unsigned int cpu)
 	u_int cm_osc;
 	struct icst_vco vco;

-	cpus_allowed = current->cpus_allowed;
+	cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current));

-	set_cpus_allowed(current, cpumask_of_cpu(cpu));
+	set_cpus_allowed_ptr(current, cpumask_of(cpu));
 	BUG_ON(cpu != smp_processor_id());

 	/* detect memory etc. */
@@ -181,7 +181,7 @@ static unsigned int integrator_get(unsigned int cpu)

 	current_freq = icst_hz(&cclk_params, vco) / 1000; /* current freq */

-	set_cpus_allowed(current, cpus_allowed);
+	set_cpus_allowed_ptr(current, &cpus_allowed);

 	return current_freq;
 }
-- 
1.7.3.1






More information about the linux-arm-kernel mailing list