From: Julien Grall <julien.grall@linaro.org>
To: xen-devel@lists.xen.org
Cc: patches@linaro.org, Julien Grall <julien.grall@linaro.org>,
ian.campbell@citrix.com, andre.przywara@linaro.org,
stefano.stabellini@eu.citrix.com
Subject: [PATCH v2 2/4] xen/arm: Add macro ALIGN
Date: Thu, 26 Sep 2013 13:56:16 +0100 [thread overview]
Message-ID: <1380200178-30776-3-git-send-email-julien.grall@linaro.org> (raw)
In-Reply-To: <1380200178-30776-1-git-send-email-julien.grall@linaro.org>
Signed-off-by: Julien Grall <julien.grall@linaro.org>
---
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
next prev parent reply other threads:[~2013-09-26 12:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 12:56 [PATCH v2 0/4] ARM: Support initrd loading Julien Grall
2013-09-26 12:56 ` [PATCH v2 1/4] xen/arm: Add macro MB Julien Grall
2013-09-26 14:32 ` Ian Campbell
2013-09-26 15:26 ` Julien Grall
2013-09-26 15:30 ` Ian Campbell
2013-09-26 15:32 ` Julien Grall
2013-09-26 15:52 ` Ian Campbell
2013-09-26 12:56 ` Julien Grall [this message]
2013-09-26 14:30 ` [PATCH v2 2/4] xen/arm: Add macro ALIGN Ian Campbell
2013-09-26 14:34 ` Andrew Cooper
2013-09-26 14:38 ` Ian Campbell
2013-09-26 14:41 ` Andrew Cooper
2013-09-26 15:26 ` Julien Grall
2013-09-26 12:56 ` [PATCH v2 3/4] xen/arm: Add support to load initrd in dom0 Julien Grall
2013-09-26 14:34 ` Ian Campbell
2013-09-26 12:56 ` [PATCH v2 4/4] xen/dts: Support Linux initrd DT bindings Julien Grall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1380200178-30776-3-git-send-email-julien.grall@linaro.org \
--to=julien.grall@linaro.org \
--cc=andre.przywara@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=patches@linaro.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).