diff options
author | Jan Beulich <jbeulich@suse.com> | 2011-10-21 09:19:44 +0200 |
---|---|---|
committer | Jan Beulich <jbeulich@suse.com> | 2011-10-21 09:19:44 +0200 |
commit | 3cfbbfcf4cb1d4fecfd1c9a8bab090bdb61e993e (patch) | |
tree | 02fa5b020be5edebcbc225f9bd6a9d413917055f /xen/arch/x86/acpi | |
parent | 20307695e5c22a58b4cce35fba5333375da5a7fa (diff) | |
download | xen-3cfbbfcf4cb1d4fecfd1c9a8bab090bdb61e993e.tar.gz xen-3cfbbfcf4cb1d4fecfd1c9a8bab090bdb61e993e.tar.bz2 xen-3cfbbfcf4cb1d4fecfd1c9a8bab090bdb61e993e.zip |
eliminate cpumask accessors referencing NR_CPUS
... in favor of using the new, nr_cpumask_bits-based ones.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/arch/x86/acpi')
-rw-r--r-- | xen/arch/x86/acpi/cpu_idle.c | 4 | ||||
-rw-r--r-- | xen/arch/x86/acpi/cpufreq/cpufreq.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 3952020956..8f1bde048e 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -233,13 +233,13 @@ void cpuidle_wakeup_mwait(cpumask_t *mask) cpumask_t target; unsigned int cpu; - cpus_and(target, *mask, cpuidle_mwait_flags); + cpumask_and(&target, mask, &cpuidle_mwait_flags); /* CPU is MWAITing on the cpuidle_mwait_wakeup flag. */ for_each_cpu_mask(cpu, target) mwait_wakeup(cpu) = 0; - cpus_andnot(*mask, *mask, target); + cpumask_andnot(mask, mask, &target); } static void mwait_idle_with_hints(unsigned long eax, unsigned long ecx) diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c index 680e7fe550..f5be78b836 100644 --- a/xen/arch/x86/acpi/cpufreq/cpufreq.c +++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c @@ -446,7 +446,7 @@ static int acpi_cpufreq_target(struct cpufreq_policy *policy, if (unlikely(result)) return -ENODEV; - cpus_and(online_policy_cpus, cpu_online_map, policy->cpus); + cpumask_and(&online_policy_cpus, &cpu_online_map, &policy->cpus); next_perf_state = data->freq_table[next_state].index; if (perf->state == next_perf_state) { |