From d694e3d8c56b6dae405a5be357a5ee9981aaba46 Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Mon, 7 Mar 2011 11:21:11 +0000 Subject: [PATCH] xen: adjust cpumask initializers to suit clang's incomplete gccisms. This is needed to compile xen with clang. Signed-off-by: Tim Deegan Acked-by: Keir Fraser --- xen/arch/x86/io_apic.c | 3 ++- xen/include/xen/cpumask.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 7a4505aeb6..3c10639786 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -1907,6 +1907,7 @@ static void __init check_timer(void) int apic1, pin1, apic2, pin2; int vector, ret; unsigned long flags; + cpumask_t mask_all = CPU_MASK_ALL; local_irq_save(flags); @@ -1917,7 +1918,7 @@ static void __init check_timer(void) vector = FIRST_HIPRIORITY_VECTOR; clear_irq_vector(0); - if ((ret = bind_irq_vector(0, vector, (cpumask_t)CPU_MASK_ALL))) + if ((ret = bind_irq_vector(0, vector, mask_all))) printk(KERN_ERR"..IRQ0 is not set correctly with ioapic!!!, err:%d\n", ret); irq_desc[0].depth = 0; diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h index 5de90747ba..f5ff64ad3a 100644 --- a/xen/include/xen/cpumask.h +++ b/xen/include/xen/cpumask.h @@ -296,7 +296,7 @@ static inline const cpumask_t *cpumask_of(unsigned int cpu) #define CPU_MASK_NONE \ /*(cpumask_t)*/ { { \ - [0 ... BITS_TO_LONGS(NR_CPUS)-1] = 0UL \ + 0UL \ } } #define CPU_MASK_CPU0 \ -- 2.39.5