From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Fri, 1 Aug 2014 14:45:23 +0000 (+0100)
Subject: xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4448
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=808b34d84544fca0b79985bbefc450ae399dd340;p=xen.git

xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 031672a81b..2e3225df74 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -29,10 +29,6 @@
 #include <xsm/xsm.h>
 #include <xen/trace.h>
 
-#ifndef is_domain_direct_mapped
-# define is_domain_direct_mapped(d) ((void)(d), 0)
-#endif
-
 struct memop_args {
     /* INPUT */
     struct domain *domain;     /* Domain to be affected. */
diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index 83329ed3bc..8fc5a45bc0 100644
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -19,6 +19,7 @@
 #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \
         d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector)
 #define is_hvm_pv_evtchn_vcpu(v) (is_hvm_pv_evtchn_domain(v->domain))
+#define is_domain_direct_mapped(d) ((void)(d), 0)
 
 #define VCPU_TRAP_NMI          1
 #define VCPU_TRAP_MCE          2