diff options
| author | Zhang Yanfei <zhangyanfei@cn.fujitsu.com> | 2013-03-15 17:46:35 +0800 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2013-03-15 16:51:02 +0100 |
| commit | 56af4f566a637b8dd78a8d4ea8624e3d27645e6e (patch) | |
| tree | a8a120370c50ceda5ee1c2ddb4a14c2cc199d1f7 /kexec/kexec-elf-rel.c | |
| parent | 337d4fcbdc45e61cab28f8ba6da49015cca5c8d0 (diff) | |
| download | kexec-tools-56af4f566a637b8dd78a8d4ea8624e3d27645e6e.tar.gz | |
kexec: use _ALIGN* to make the logic clear
By replacing all the explicit align opertion with marco _ALIGN*,
the code logic could more clear.
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/kexec-elf-rel.c')
| -rw-r--r-- | kexec/kexec-elf-rel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kexec/kexec-elf-rel.c b/kexec/kexec-elf-rel.c index 8880c8b..38e34ec 100644 --- a/kexec/kexec-elf-rel.c +++ b/kexec/kexec-elf-rel.c @@ -225,7 +225,7 @@ int elf_rel_load(struct mem_ehdr *ehdr, struct kexec_info *info, buf_align = align; } /* Now align bufsz */ - bufsz = (bufsz + (align - 1)) & ~(align - 1); + bufsz = _ALIGN(bufsz, align); /* And now add our buffer */ bufsz += shdr->sh_size; } @@ -237,7 +237,7 @@ int elf_rel_load(struct mem_ehdr *ehdr, struct kexec_info *info, bss_align = align; } /* Now align bsssz */ - bsssz = (bsssz + (align - 1)) & ~(align -1); + bsssz = _ALIGN(bsssz, align); /* And now add our buffer */ bsssz += shdr->sh_size; } @@ -269,7 +269,7 @@ int elf_rel_load(struct mem_ehdr *ehdr, struct kexec_info *info, if (shdr->sh_type != SHT_NOBITS) { unsigned long off; /* Adjust the address */ - data_addr = (data_addr + (align - 1)) & ~(align -1); + data_addr = _ALIGN(data_addr, align); /* Update the section */ off = data_addr - buf_addr; @@ -281,7 +281,7 @@ int elf_rel_load(struct mem_ehdr *ehdr, struct kexec_info *info, data_addr += shdr->sh_size; } else { /* Adjust the address */ - bss_addr = (bss_addr + (align - 1)) & ~(align -1); + bss_addr = _ALIGN(bss_addr, align); /* Update the section */ shdr->sh_addr = bss_addr; |