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

[Magnus Damm <magnus@xxxxxxxxxxxxx>]

[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>
---

 Applies on top of xen-unstable-12717.

 xen/include/xen/elfcore.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- 0001/xen/include/xen/elfcore.h
+++ work/xen/include/xen/elfcore.h      2006-12-04 13:04:03.000000000 +0900
@@ -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-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel