[PATCH 11/13] kexec: s390: remove ALIGN_UP and use _ALIGN_UP

Zhang Yanfei
2013-03-13T17:34:03Z

From: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>

We have _ALIGN_UP now, so remove ALIGN_UP and use _ALIGN_UP
instead of it.

Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
---
kexec/arch/s390/kexec-image.c | 2 +-
kexec/arch/s390/kexec-s390.h | 1 -
2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/kexec/arch/s390/kexec-image.c b/kexec/arch/s390/kexec-image.c
index ee101cb..d3af800 100644
--- a/kexec/arch/s390/kexec-image.c
+++ b/kexec/arch/s390/kexec-image.c
@@ -112,7 +112,7 @@ image_s390_load(int argc, char **argv, const char *kernel_buf,
return -1;
}
ramdisk_origin = MAX(RAMDISK_ORIGIN_ADDR, kernel_size);
- ramdisk_origin = ALIGN_UP(ramdisk_origin, 0x100000);
+ ramdisk_origin = _ALIGN_UP(ramdisk_origin, 0x100000);
add_segment_check(info, rd_buffer, ramdisk_len,
ramdisk_origin, ramdisk_len);
}
diff --git a/kexec/arch/s390/kexec-s390.h b/kexec/arch/s390/kexec-s390.h
index cbc3340..ee62888 100644
--- a/kexec/arch/s390/kexec-s390.h
+++ b/kexec/arch/s390/kexec-s390.h
@@ -21,7 +21,6 @@
#define COMMAND_LINESIZE 896
#define MAX_MEMORY_RANGES 1024

-#define ALIGN_UP(addr, size) (((addr) + ((size)-1)) & (~((size)-1)))
#define MAX(x, y) ((x) > (y) ? (x) : (y))
#define MIN(x, y) ((x) < (y) ? (x) : (y))

--
1.7.1