[Xen-devel] [PATCH v2 2/4] xen/arm: Add macro ALIGN

[Julien Grall <julien.grall@xxxxxxxxxx>]

Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>
---
 xen/common/device_tree.c     |    2 --
 xen/include/asm-arm/config.h |    4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 9a16650..32cbb1e 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -65,8 +65,6 @@ static LIST_HEAD(aliases_lookup);
             printk(fmt, ## __VA_ARGS__);            \
     } while (0)
 
-#define ALIGN(x, a) ((x + (a) - 1) & ~((a) - 1));
-
 // #define DEBUG_DT
 
 #ifdef DEBUG_DT
diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h
index 2cea1ba..35f3b29 100644
--- a/xen/include/asm-arm/config.h
+++ b/xen/include/asm-arm/config.h
@@ -186,6 +186,10 @@
 #define STACK_SIZE  (PAGE_SIZE << STACK_ORDER)
 
 #ifndef __ASSEMBLY__
+#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
+#endif
+
+#ifndef __ASSEMBLY__
 extern unsigned long xen_phys_start;
 extern unsigned long xenheap_phys_end;
 extern unsigned long frametable_virt_end;
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel