From: Yuntao Wang <ytcoode@gmail.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Juergen Gross <jgross@suse.com>, Baoquan He <bhe@redhat.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Saurabh Sengar <ssengar@linux.microsoft.com>,
Yuntao Wang <ytcoode@gmail.com>
Subject: [PATCH] x86/setup: Use a more concise memblock API
Date: Tue, 14 Nov 2023 11:14:18 +0800 [thread overview]
Message-ID: <20231114031418.60745-1-ytcoode@gmail.com> (raw)
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@gmail.com>
---
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
next reply other threads:[~2023-11-14 3:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-14 3:14 Yuntao Wang [this message]
2023-11-14 4:11 ` [PATCH] x86/setup: Use a more concise memblock API Baoquan He
2023-11-14 7:37 ` [PATCH v2] " Yuntao Wang
2023-11-14 8:36 ` Baoquan He
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231114031418.60745-1-ytcoode@gmail.com \
--to=ytcoode@gmail.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=ssengar@linux.microsoft.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox