xen: Add macros MB and GB

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Keir Fraser <keir@xen.org>
CC: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index 9e395c2e6562fed75c65d5fe0a7609c33e9c8d19..5b7b1a862f7fe7736d96dcb5ed12727cf2236ffd 100644 (file)
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -142,7 +142,6 @@
 #define SLOT0_ENTRY_BITS  39
 #define SLOT0(slot) (_AT(vaddr_t,slot) << SLOT0_ENTRY_BITS)
 #define SLOT0_ENTRY_SIZE  SLOT0(1)
-#define GB(_gb)     (_AC(_gb, UL) << 30)
 
 #define VMAP_VIRT_START  GB(1)
 #define VMAP_VIRT_END    (VMAP_VIRT_START + GB(1) - 1)

diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h
index a52298ea3b0a2dc1657815132a58488d3c8a7650..657c6e5b8cfda8391a3e8544abbf22ce0d3d6b42 100644 (file)
--- a/xen/include/xen/config.h
+++ b/xen/include/xen/config.h
@@ -69,6 +69,9 @@
 #define __force
 #define __bitwise
 
+#define MB(_mb)     (_AC(_mb, UL) << 20)
+#define GB(_gb)     (_AC(_gb, UL) << 30)
+
 #ifndef __ASSEMBLY__
 
 int current_domain_id(void);