x86: redefine a few empty macros as explicit nops.

This is needed to compile xen with clang.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>

diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h
index b2c46a9ecc3f5ad5f1ed045b1e4f5aebde089075..6845d1e6f45e855c850a29fa173c7ae55e50814a 100644 (file)
--- a/xen/include/asm-x86/apic.h
+++ b/xen/include/asm-x86/apic.h
@@ -6,7 +6,7 @@
 #include <asm/fixmap.h>
 #include <asm/msr.h>
 
-#define Dprintk(x...)
+#define Dprintk(x...) do {} while (0)
 
 /*
  * Debugging macros

diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h
index 5a39aae0a9f4c18bbfa992f36b08f8812ed87879..92e96e30fb2124c3ecafbdd409e87410e8e10c43 100644 (file)
--- a/xen/include/asm-x86/hvm/support.h
+++ b/xen/include/asm-x86/hvm/support.h
@@ -61,7 +61,7 @@ extern unsigned int opt_hvm_debug_level;
                    ## _a);                                                    \
     } while (0)
 #else
-#define HVM_DBG_LOG(level, _f, _a...)
+#define HVM_DBG_LOG(level, _f, _a...) do {} while (0)
 #endif
 
 extern unsigned long hvm_io_bitmap[];