# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1299496871 0
# Node ID fed25f206a372891b7a0f1368592e25eda479788
# Parent  692a97ea255e8150f088cb9e71f32fd9f9825e06
xen: adjust cpumask initializers to suit clang's incomplete gccisms.
This is needed to compile xen with clang.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>

diff -r 692a97ea255e -r fed25f206a37 xen/arch/x86/io_apic.c
--- a/xen/arch/x86/io_apic.c	Mon Mar 07 11:21:11 2011 +0000
+++ b/xen/arch/x86/io_apic.c	Mon Mar 07 11:21:11 2011 +0000
@@ -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 -r 692a97ea255e -r fed25f206a37 xen/include/xen/cpumask.h
--- a/xen/include/xen/cpumask.h	Mon Mar 07 11:21:11 2011 +0000
+++ b/xen/include/xen/cpumask.h	Mon Mar 07 11:21:11 2011 +0000
@@ -296,7 +296,7 @@ static inline const cpumask_t *cpumask_o
 
 #define CPU_MASK_NONE							\
 /*(cpumask_t)*/ { {							\
-	[0 ... BITS_TO_LONGS(NR_CPUS)-1] =  0UL				\
+	0UL								\
 } }
 
 #define CPU_MASK_CPU0							\