2023-12-12 14:28:09

by Yuntao Wang

Subject: [PATCH] kexec: Use ALIGN macro instead of open-coding it

Use ALIGN macro instead of open-coding it to improve code readability.

Signed-off-by: Yuntao Wang <[email protected]>
---
kernel/kexec_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
index be5642a4ec49..0113436e4a3a 100644
--- a/kernel/kexec_core.c
+++ b/kernel/kexec_core.c
@@ -430,7 +430,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,

pages = NULL;
size = (1 << order) << PAGE_SHIFT;
- hole_start = (image->control_page + (size - 1)) & ~(size - 1);
+ hole_start = ALIGN(image->control_page, size);
hole_end = hole_start + size - 1;
while (hole_end <= crashk_res.end) {
unsigned long i;
@@ -447,7 +447,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
mend = mstart + image->segment[i].memsz - 1;
if ((hole_end >= mstart) && (hole_start <= mend)) {
/* Advance the hole to the end of the segment */
- hole_start = (mend + (size - 1)) & ~(size - 1);
+ hole_start = ALIGN(mend, size);
hole_end = hole_start + size - 1;
break;
}
--
2.43.0

2023-12-13 02:49:36

by Baoquan He

Subject: Re: [PATCH] kexec: Use ALIGN macro instead of open-coding it

On 12/12/23 at 10:27pm, Yuntao Wang wrote:
> Use ALIGN macro instead of open-coding it to improve code readability.
>
> Signed-off-by: Yuntao Wang <[email protected]>
> ---
> kernel/kexec_core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

LGTM,

Acked-by: Baoquan He <[email protected]>

>
> diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
> index be5642a4ec49..0113436e4a3a 100644
> --- a/kernel/kexec_core.c
> +++ b/kernel/kexec_core.c
> @@ -430,7 +430,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
>
> pages = NULL;
> size = (1 << order) << PAGE_SHIFT;
> - hole_start = (image->control_page + (size - 1)) & ~(size - 1);
> + hole_start = ALIGN(image->control_page, size);
> hole_end = hole_start + size - 1;
> while (hole_end <= crashk_res.end) {
> unsigned long i;
> @@ -447,7 +447,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image,
> mend = mstart + image->segment[i].memsz - 1;
> if ((hole_end >= mstart) && (hole_start <= mend)) {
> /* Advance the hole to the end of the segment */
> - hole_start = (mend + (size - 1)) & ~(size - 1);
> + hole_start = ALIGN(mend, size);
> hole_end = hole_start + size - 1;
> break;
> }
> --
> 2.43.0
>
>
> _______________________________________________
> kexec mailing list
> [email protected]
> http://lists.infradead.org/mailman/listinfo/kexec
>