diff options
| author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2013-03-14 01:33:53 +0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-03-14 18:24:26 +0900 |
| commit | 333f48733565f6a3df826b072db9dd6d1c713cb0 (patch) | |
| tree | bfa3a96efb462d22287dabc8dda5214175bca73d | |
| parent | d41a4db8ef0a5995cb2fd8e88220b721be36bc0a (diff) | |
| download | kexec-tools-333f48733565f6a3df826b072db9dd6d1c713cb0.tar.gz | |
kexec: s390: remove ALIGN_UP and use _ALIGN_UP
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>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/s390/kexec-image.c | 2 | ||||
| -rw-r--r-- | 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 ee101cb1..d3af800f 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 cbc33401..ee628881 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)) |