ia64/xen-unstable

changeset 12771:f4089172c96b

[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>
author Ian Campbell <ian.campbell@xensource.com>
date Mon Dec 04 09:08:47 2006 +0000 (2006-12-04)
parents 3bd721db6db5
children b08b870770f9
files xen/include/xen/elfcore.h
line diff
     1.1 --- a/xen/include/xen/elfcore.h	Sun Dec 03 17:44:14 2006 +0000
     1.2 +++ b/xen/include/xen/elfcore.h	Mon Dec 04 09:08:47 2006 +0000
     1.3 @@ -71,8 +71,8 @@ typedef struct
     1.4   *   That requires infrastructure. Let's not.
     1.5   */
     1.6  
     1.7 -#define ALIGN(x, n) ((x + ((1 << n) - 1)) / (1 << n))
     1.8 -#define PAD32(x) u32 pad_data[ALIGN(x, 2)]
     1.9 +#define NOTE_ALIGN(x, n) ((x + ((1 << n) - 1)) / (1 << n))
    1.10 +#define PAD32(x) u32 pad_data[NOTE_ALIGN(x, 2)]
    1.11  
    1.12  #define TYPEDEF_NOTE(type, strlen, desctype)    \
    1.13      typedef struct {                            \