From: Tim Deegan <Tim.Deegan@citrix.com>
Date: Mon, 7 Mar 2011 11:21:11 +0000 (+0000)
Subject: x86: redefine a few empty macros as explicit nops.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=df79b5a8de3d6805f795da0aa29239c10029127c;p=people%2Ftklengyel%2Fxen.git

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 b2c46a9ecc..6845d1e6f4 100644
--- 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 5a39aae0a9..92e96e30fb 100644
--- 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[];