x86 cpufreq: Fix debug=y build.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c
index edd581ba94daf1bcf17b860566bb270681392301..26339a0867dc1cf980b15851cd65d2393515d479 100644 (file)
--- a/xen/arch/x86/acpi/cpufreq/cpufreq.c
+++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c
@@ -180,7 +180,7 @@ static void drv_read(struct drv_cmd *cmd)
 {
     cmd->val = 0;
 
-    ASSERT(cpus_weight(cmd->mask) == 1);
+    ASSERT(cpumask_weight(cmd->mask) == 1);
 
     /* to reduce IPI for the sake of performance */
     if (likely(cpumask_test_cpu(smp_processor_id(), cmd->mask)))

diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h
index 4dbb3054ce3f6bf09ec03d795be8b2ee97b6a358..5de90747bac784aa577568dc5f65c2611769094e 100644 (file)
--- a/xen/include/xen/cpumask.h
+++ b/xen/include/xen/cpumask.h
@@ -192,6 +192,7 @@ static inline int __cpus_full(const cpumask_t *srcp, int nbits)
        return bitmap_full(srcp->bits, nbits);
 }
 
+#define cpumask_weight(cpumask) __cpus_weight(cpumask, NR_CPUS)
 #define cpus_weight(cpumask) __cpus_weight(&(cpumask), NR_CPUS)
 static inline int __cpus_weight(const cpumask_t *srcp, int nbits)
 {