Commit 334ef7a7 authored by Mike Travis's avatar Mike Travis Committed by Thomas Gleixner
Browse files

x86: use performance variant for_each_cpu_mask_nr 



Change references from for_each_cpu_mask to for_each_cpu_mask_nr
where appropriate

Reviewed-by: default avatarPaul Jackson <pj@sgi.com>
Reviewed-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>

commit 2d474871e2fb092eb46a0930aba5442e10eb96cc
Author: Mike Travis <travis@sgi.com>
Date:   Mon May 12 21:21:13 2008 +0200
parent 0e12f848

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

+3 −3
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static void drv_write(struct drv_cmd *cmd) 
	cpumask_t saved_mask = current->cpus_allowed;

	unsigned int i;



	for_each_cpu_mask(i, cmd->mask) {

	for_each_cpu_mask_nr(i, cmd->mask) {

		set_cpus_allowed_ptr(current, &cpumask_of_cpu(i));

		do_drv_write(cmd);

	}
@@ -451,7 +451,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, 


	freqs.old = perf->states[perf->state].core_frequency * 1000;

	freqs.new = data->freq_table[next_state].frequency;

	for_each_cpu_mask(i, cmd.mask) {

	for_each_cpu_mask_nr(i, cmd.mask) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	}
@@ -466,7 +466,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, 
		}

	}



	for_each_cpu_mask(i, cmd.mask) {

	for_each_cpu_mask_nr(i, cmd.mask) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	}

arch/x86/kernel/cpu/cpufreq/p4-clockmod.c

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy, 
		return 0;



	/* notifiers */

	for_each_cpu_mask(i, policy->cpus) {

	for_each_cpu_mask_nr(i, policy->cpus) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	}
@@ -130,11 +130,11 @@ static int cpufreq_p4_target(struct cpufreq_policy *policy, 
	/* run on each logical CPU, see section 13.15.3 of IA32 Intel Architecture Software

	 * Developer's Manual, Volume 3

	 */

	for_each_cpu_mask(i, policy->cpus)

	for_each_cpu_mask_nr(i, policy->cpus)

		cpufreq_p4_setdc(i, p4clockmod_table[newstate].index);



	/* notifiers */

	for_each_cpu_mask(i, policy->cpus) {

	for_each_cpu_mask_nr(i, policy->cpus) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	}

arch/x86/kernel/cpu/cpufreq/powernow-k8.c

+4 −4
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data, unsigned i 
	freqs.old = find_khz_freq_from_fid(data->currfid);

	freqs.new = find_khz_freq_from_fid(fid);



	for_each_cpu_mask(i, *(data->available_cores)) {

	for_each_cpu_mask_nr(i, *(data->available_cores)) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	}
@@ -974,7 +974,7 @@ static int transition_frequency_fidvid(struct powernow_k8_data *data, unsigned i 
	res = transition_fid_vid(data, fid, vid);

	freqs.new = find_khz_freq_from_fid(data->currfid);



	for_each_cpu_mask(i, *(data->available_cores)) {

	for_each_cpu_mask_nr(i, *(data->available_cores)) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	}
@@ -997,7 +997,7 @@ static int transition_frequency_pstate(struct powernow_k8_data *data, unsigned i 
	freqs.old = find_khz_freq_from_pstate(data->powernow_table, data->currpstate);

	freqs.new = find_khz_freq_from_pstate(data->powernow_table, pstate);



	for_each_cpu_mask(i, *(data->available_cores)) {

	for_each_cpu_mask_nr(i, *(data->available_cores)) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	}
@@ -1005,7 +1005,7 @@ static int transition_frequency_pstate(struct powernow_k8_data *data, unsigned i 
	res = transition_pstate(data, pstate);

	freqs.new = find_khz_freq_from_pstate(data->powernow_table, pstate);



	for_each_cpu_mask(i, *(data->available_cores)) {

	for_each_cpu_mask_nr(i, *(data->available_cores)) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	}

arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c

+5 −5
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ static int centrino_target (struct cpufreq_policy *policy, 
	saved_mask = current->cpus_allowed;

	first_cpu = 1;

	cpus_clear(covered_cpus);

	for_each_cpu_mask(j, online_policy_cpus) {

	for_each_cpu_mask_nr(j, online_policy_cpus) {

		/*

		 * Support for SMP systems.

		 * Make sure we are running on CPU that wants to change freq
@@ -517,7 +517,7 @@ static int centrino_target (struct cpufreq_policy *policy, 
			dprintk("target=%dkHz old=%d new=%d msr=%04x\n",

				target_freq, freqs.old, freqs.new, msr);



			for_each_cpu_mask(k, online_policy_cpus) {

			for_each_cpu_mask_nr(k, online_policy_cpus) {

				freqs.cpu = k;

				cpufreq_notify_transition(&freqs,

					CPUFREQ_PRECHANGE);
@@ -540,7 +540,7 @@ static int centrino_target (struct cpufreq_policy *policy, 
		preempt_enable();

	}



	for_each_cpu_mask(k, online_policy_cpus) {

	for_each_cpu_mask_nr(k, online_policy_cpus) {

		freqs.cpu = k;

		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	}
@@ -554,7 +554,7 @@ static int centrino_target (struct cpufreq_policy *policy, 
		 */



		if (!cpus_empty(covered_cpus)) {

			for_each_cpu_mask(j, covered_cpus) {

			for_each_cpu_mask_nr(j, covered_cpus) {

				set_cpus_allowed_ptr(current,

						     &cpumask_of_cpu(j));

				wrmsr(MSR_IA32_PERF_CTL, oldmsr, h);
@@ -564,7 +564,7 @@ static int centrino_target (struct cpufreq_policy *policy, 
		tmp = freqs.new;

		freqs.new = freqs.old;

		freqs.old = tmp;

		for_each_cpu_mask(j, online_policy_cpus) {

		for_each_cpu_mask_nr(j, online_policy_cpus) {

			freqs.cpu = j;

			cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

			cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

arch/x86/kernel/cpu/cpufreq/speedstep-ich.c

+2 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int speedstep_target (struct cpufreq_policy *policy, 


	cpus_allowed = current->cpus_allowed;



	for_each_cpu_mask(i, policy->cpus) {

	for_each_cpu_mask_nr(i, policy->cpus) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);

	}
@@ -292,7 +292,7 @@ static int speedstep_target (struct cpufreq_policy *policy, 
	/* allow to be run on all CPUs */

	set_cpus_allowed_ptr(current, &cpus_allowed);



	for_each_cpu_mask(i, policy->cpus) {

	for_each_cpu_mask_nr(i, policy->cpus) {

		freqs.cpu = i;

		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);

	}