Skip to contentSkip to conversation

mm/memblock: Remove redundant pageblock_align() in free_unused_memmap()

PATCH Applied Zhen Ni 2 participants 3 messages Jun 12 – Jun 30

Subsystems (2)
lore
Share & tools
lore

Zhen Ni

author
#0 lore raw

PATCH 1/1 mm/memblock: Remove redundant pageblock_align() in free_unused_memmap()

The assignment prev_end = pageblock_align(end) is redundant because prev_end was already aligned to pageblock oundaries inside the loop. Since pageblock_align() is a pure function, calling it again with the same input produces the same result.

This line was added in commit f921f53e089a ("memblock: align freed memory map on pageblock boundaries with SPARSEMEM"). Remove it to simplify the code.

---
 mm/memblock.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
mm/memblock.c +1 -3
index ccd43f3abb82..f50792375604 100644
@@ -2258,10 +2258,8 @@ static void __init free_unused_memmap(void)
 	}
 
 #ifdef CONFIG_SPARSEMEM
-	if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION)) {
-		prev_end = pageblock_align(end);
+	if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION))
 		free_memmap(prev_end, ALIGN(prev_end, PAGES_PER_SECTION));
-	}
 #endif
 }
 
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 10 lines · Zhen Ni

The assignment prev_end = pageblock_align(end) is redundant because prev_end was already aligned to pageblock oundaries inside the loop. Since pageblock_align() is a pure function, calling it again with the same input produces the same result.

This line was added in commit f921f53e089a ("memblock: align freed memory map on pageblock boundaries with SPARSEMEM"). Remove it to simplify the code.

I queued it up for after -rc1.

Quoted 3 lines
---
 mm/memblock.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Signature · 2 lines
Sincerely yours,
Mike.