summaryrefslogtreecommitdiff
path: root/kexec/arch/s390/kexec-image.c
diff options
context:
space:
mode:
authorZhang Yanfei <zhangyanfei@cn.fujitsu.com>2013-03-14 01:33:53 +0800
committerSimon Horman <horms@verge.net.au>2013-03-14 18:24:26 +0900
commit333f48733565f6a3df826b072db9dd6d1c713cb0 (patch)
treebfa3a96efb462d22287dabc8dda5214175bca73d /kexec/arch/s390/kexec-image.c
parentd41a4db8ef0a5995cb2fd8e88220b721be36bc0a (diff)
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>
Diffstat (limited to 'kexec/arch/s390/kexec-image.c')
-rw-r--r--kexec/arch/s390/kexec-image.c2
1 files changed, 1 insertions, 1 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);
}