From: Zhang Yanfei <zhangyanfei@xxxxxxxxxxxxxx>
By replacing all the explicit align opertion with marco _ALIGN*,
the code logic could be more clear.
Signed-off-by: Zhang Yanfei <zhangyanfei at cn.fujitsu.com>
---
kexec/arch/ppc64/crashdump-ppc64.c | 4 ++--
kexec/arch/ppc64/fs2dt.c | 6 ++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/kexec/arch/ppc64/crashdump-ppc64.c b/kexec/arch/ppc64/crashdump-ppc64.c
index b8a63bd..49cab12 100644
--- a/kexec/arch/ppc64/crashdump-ppc64.c
+++ b/kexec/arch/ppc64/crashdump-ppc64.c
@@ -298,7 +298,7 @@ static int get_crash_memory_ranges(struct memory_range **range, int *ranges)
* to the next page size boundary though, so makedumpfile can
* read it safely without going south on us.
*/
- cend = (cend + page_size - 1) & (~(page_size - 1));
+ cend = _ALIGN(cend, page_size);
crash_memory_range[memory_ranges].start = cstart;
crash_memory_range[memory_ranges++].end = cend;
@@ -400,7 +400,7 @@ int load_crashdump_segments(struct kexec_info *info, char* mod_cmdline,
info->backup_src_start = BACKUP_SRC_START;
info->backup_src_size = BACKUP_SRC_SIZE;
/* Create a backup region segment to store backup data*/
- sz = (BACKUP_SRC_SIZE + align - 1) & ~(align - 1);
+ sz = _ALIGN(BACKUP_SRC_SIZE, align);
tmp = xmalloc(sz);
memset(tmp, 0, sz);
info->backup_start = add_buffer(info, tmp, sz, sz, align,
diff --git a/kexec/arch/ppc64/fs2dt.c b/kexec/arch/ppc64/fs2dt.c
index 9750c34..62edc93 100644
--- a/kexec/arch/ppc64/fs2dt.c
+++ b/kexec/arch/ppc64/fs2dt.c
@@ -698,8 +698,7 @@ int create_flatten_tree(char **bufp, off_t *sizep, char *cmdline)
dt_reserve(&dt, 1);
*dt++ = 9;
- len = sizeof(bb[0]);
- len += 7; len &= ~7;
+ len = _ALIGN(sizeof(bb[0], 8);
bb->off_mem_rsvmap = len;
@@ -714,8 +713,7 @@ int create_flatten_tree(char **bufp, off_t *sizep, char *cmdline)
len *= sizeof(unsigned);
bb->off_dt_strings = bb->off_dt_struct + len;
- len = propnum("");
- len += 3; len &= ~3;
+ len = _ALIGN(propnum(""), 4);
bb->totalsize = bb->off_dt_strings + len;
bb->magic = 0xd00dfeed;
--
1.7.1
