[PATCH] x86/setup: Use a more concise memblock API

From: Yuntao Wang
Date: Mon Nov 13 2023 - 22:16:14 EST


When executing relocate_initrd(), the memblock.current_limit field has
already been set to `max_pfn_mapped << PAGE_SHIFT`, so we can replace
memblock_phys_alloc_range() with memblock_phys_alloc(), which has the same
functionality but is more concise.

Signed-off-by: Yuntao Wang <ytcoode@xxxxxxxxx>
---
arch/x86/kernel/setup.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index ec2c21a1844e..422497c17eec 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -259,8 +259,7 @@ static void __init relocate_initrd(void)
u64 area_size = PAGE_ALIGN(ramdisk_size);

/* We need to move the initrd down into directly mapped mem */
- u64 relocated_ramdisk = memblock_phys_alloc_range(area_size, PAGE_SIZE, 0,
- PFN_PHYS(max_pfn_mapped));
+ u64 relocated_ramdisk = memblock_phys_alloc(area_size, PAGE_SIZE);
if (!relocated_ramdisk)
panic("Cannot find place for new RAMDISK of size %lld\n",
ramdisk_size);
--
2.42.1