aboutsummaryrefslogtreecommitdiffstats
path: root/xen/include/xen/elfcore.h
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@xensource.com>2006-12-04 09:08:47 +0000
committerIan Campbell <ian.campbell@xensource.com>2006-12-04 09:08:47 +0000
commit6b995a3b55f8d6660985958a141609f251b82d9e (patch)
tree4eb550bf6d8fadf6e84a5bac0111a226d7686463 /xen/include/xen/elfcore.h
parent0831896293f7f24b0e7acdbb250a8b10751491ba (diff)
downloadxen-6b995a3b55f8d6660985958a141609f251b82d9e.tar.gz
xen-6b995a3b55f8d6660985958a141609f251b82d9e.tar.bz2
xen-6b995a3b55f8d6660985958a141609f251b82d9e.zip
[PATCH 01/02] Kexec / Kdump: Use NOTE_ALIGN() instead of ALIGN()
ALIGN() is already defined in xen/include/asm-ia64/config.h. This patch renames ALIGN() to NOTE_ALIGN() to make the kexec code build on ia64. Signed-Off-By: Magnus Damm <magnus@valinux.co.jp>
Diffstat (limited to 'xen/include/xen/elfcore.h')
-rw-r--r--xen/include/xen/elfcore.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/xen/include/xen/elfcore.h b/xen/include/xen/elfcore.h
index d578d0dd0b..75ce7c49ef 100644
--- a/xen/include/xen/elfcore.h
+++ b/xen/include/xen/elfcore.h
@@ -71,8 +71,8 @@ typedef struct
* That requires infrastructure. Let's not.
*/
-#define ALIGN(x, n) ((x + ((1 << n) - 1)) / (1 << n))
-#define PAD32(x) u32 pad_data[ALIGN(x, 2)]
+#define NOTE_ALIGN(x, n) ((x + ((1 << n) - 1)) / (1 << n))
+#define PAD32(x) u32 pad_data[NOTE_ALIGN(x, 2)]
#define TYPEDEF_NOTE(type, strlen, desctype) \
typedef struct { \