[Xen-changelog] [xen-unstable] [PATCH 01/02] Kexec / Kdump: Use NOTE_ALIGN() instead of ALIGN()

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Node ID f4089172c96b02a04a9cf512eac8a888813fc15c
# Parent  3bd721db6db5c71a1d33d2898e027542d338889a
[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@xxxxxxxxxxxxx>
---
 xen/include/xen/elfcore.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r 3bd721db6db5 -r f4089172c96b xen/include/xen/elfcore.h
--- a/xen/include/xen/elfcore.h Sun Dec 03 17:44:14 2006 +0000
+++ b/xen/include/xen/elfcore.h Mon Dec 04 09:08:47 2006 +0000
@@ -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 {                            \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog