Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cb0535f authored by Rusty Russell's avatar Rusty Russell Committed by Ingo Molnar
Browse files

cpumask: replace CPUMASK_ALLOC etc with cpumask_var_t 



Impact: cleanup

There's only one user, and it's a fairly easy conversion.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarDave Jones <davej@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d12418fd

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

+9 −12
Original line number Original line Diff line number Diff line
@@ -458,11 +458,6 @@ static int centrino_verify (struct cpufreq_policy *policy) 
 *

 *

 * Sets a new CPUFreq policy.

 * Sets a new CPUFreq policy.

 */

 */

struct allmasks {

	cpumask_t		saved_mask;

	cpumask_t		covered_cpus;

};



static int centrino_target (struct cpufreq_policy *policy,

static int centrino_target (struct cpufreq_policy *policy,

			    unsigned int target_freq,

			    unsigned int target_freq,

			    unsigned int relation)

			    unsigned int relation)
@@ -472,12 +467,15 @@ static int centrino_target (struct cpufreq_policy *policy, 
	struct cpufreq_freqs	freqs;

	struct cpufreq_freqs	freqs;

	int			retval = 0;

	int			retval = 0;

	unsigned int		j, k, first_cpu, tmp;

	unsigned int		j, k, first_cpu, tmp;

	CPUMASK_ALLOC(allmasks);

	cpumask_var_t saved_mask, covered_cpus;

	CPUMASK_PTR(saved_mask, allmasks);

	CPUMASK_PTR(covered_cpus, allmasks);





	if (unlikely(allmasks == NULL))

	if (unlikely(!alloc_cpumask_var(&saved_mask, GFP_KERNEL)))

		return -ENOMEM;

		return -ENOMEM;

	if (unlikely(!alloc_cpumask_var(&covered_cpus, GFP_KERNEL))) {

		free_cpumask_var(saved_mask);

		return -ENOMEM;

	}

	cpumask_copy(saved_mask, &current->cpus_allowed);





	if (unlikely(per_cpu(centrino_model, cpu) == NULL)) {

	if (unlikely(per_cpu(centrino_model, cpu) == NULL)) {

		retval = -ENODEV;

		retval = -ENODEV;
@@ -493,9 +491,7 @@ static int centrino_target (struct cpufreq_policy *policy, 
		goto out;

		goto out;

	}

	}





	*saved_mask = current->cpus_allowed;

	first_cpu = 1;

	first_cpu = 1;

	cpus_clear(*covered_cpus);

	for_each_cpu_mask_nr(j, policy->cpus) {

	for_each_cpu_mask_nr(j, policy->cpus) {

		const cpumask_t *mask;

		const cpumask_t *mask;
@@ -605,7 +601,8 @@ static int centrino_target (struct cpufreq_policy *policy, 
	preempt_enable();

	preempt_enable();

	set_cpus_allowed_ptr(current, saved_mask);

	set_cpus_allowed_ptr(current, saved_mask);

out:

out:

	CPUMASK_FREE(allmasks);

	free_cpumask_var(saved_mask);

	free_cpumask_var(covered_cpus);

	return retval;

	return retval;

}

}