You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.4 KiB
33 lines
1.4 KiB
2 years ago
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Axtens <dja@axtens.net>
|
||
|
|
Date: Thu, 25 Nov 2021 02:22:47 +1100
|
||
|
|
Subject: [PATCH] mm: grub_real_malloc(): Make small allocs comment match code
|
||
|
|
|
||
|
|
Small allocations move the region's *first pointer. The comment
|
||
|
|
says that this happens for allocations under 64K. The code says
|
||
|
|
it's for allocations under 32K. Commit 45bf8b3a7549 changed the
|
||
|
|
code intentionally: make the comment match.
|
||
|
|
|
||
|
|
Fixes: 45bf8b3a7549 (* grub-core/kern/mm.c (grub_real_malloc): Decrease cut-off of moving the)
|
||
|
|
|
||
|
|
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
(cherry picked from commit a847895a8d000bdf27ad4d4326f883a0eed769ca)
|
||
|
|
---
|
||
|
|
grub-core/kern/mm.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
|
||
|
|
index fb20e93acf..db7e0b2a5b 100644
|
||
|
|
--- a/grub-core/kern/mm.c
|
||
|
|
+++ b/grub-core/kern/mm.c
|
||
|
|
@@ -306,7 +306,7 @@ grub_real_malloc (grub_mm_header_t *first, grub_size_t n, grub_size_t align)
|
||
|
|
/* Mark find as a start marker for next allocation to fasten it.
|
||
|
|
This will have side effect of fragmenting memory as small
|
||
|
|
pieces before this will be un-used. */
|
||
|
|
- /* So do it only for chunks under 64K. */
|
||
|
|
+ /* So do it only for chunks under 32K. */
|
||
|
|
if (n < (0x8000 >> GRUB_MM_ALIGN_LOG2)
|
||
|
|
|| *first == cur)
|
||
|
|
*first = prev;
|