From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from [222.73.24.84] (helo=song.cn.fujitsu.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UG4dQ-0004Us-FS for kexec@lists.infradead.org; Thu, 14 Mar 2013 09:39:44 +0000 Message-ID: <51419A7A.3000503@cn.fujitsu.com> Date: Thu, 14 Mar 2013 17:38:02 +0800 From: Zhang Yanfei MIME-Version: 1.0 Subject: [PATCH v2 10/13] kexec: ppc64: use _ALIGN* to make the logic clear References: <5140B511.7020109@gmail.com> <5140B853.2050906@gmail.com> In-Reply-To: <5140B853.2050906@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Zhang Yanfei Cc: Simon Horman , "kexec@lists.infradead.org" By replacing all the explicit align opertion with marco _ALIGN*, the code logic could be more clear. Signed-off-by: Zhang Yanfei --- 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 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec