From: Baoquan He <bhe@redhat.com>
To: Yuntao Wang <ytcoode@gmail.com>
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
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>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Juergen Gross <jgross@suse.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Saurabh Sengar <ssengar@linux.microsoft.com>
Subject: Re: [PATCH] x86/setup: Make relocated_ramdisk a local variable of relocate_initrd()
Date: Mon, 13 Nov 2023 13:00:34 +0800 [thread overview]
Message-ID: <ZVGtclq4f33e/TWZ@MiWiFi-R3L-srv> (raw)
In-Reply-To: <20231113034026.130679-1-ytcoode@gmail.com>
On 11/13/23 at 11:40am, Yuntao Wang wrote:
> After commit 0b62f6cb0773 ("x86/microcode/32: Move early loading after
> paging enable"), the global variable relocated_ramdisk is no longer used
> anywhere except for the relocate_initrd() function. Make it a local
> variable of that function.
It's true.
Reviewed-by: Baoquan He <bhe@redhat.com>
> ---
> arch/x86/include/asm/setup.h | 2 --
> arch/x86/kernel/setup.c | 4 +---
> 2 files changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
> index bf483fcb4e57..5c83729c8e71 100644
> --- a/arch/x86/include/asm/setup.h
> +++ b/arch/x86/include/asm/setup.h
> @@ -31,8 +31,6 @@
> #include <asm/bootparam.h>
> #include <asm/x86_init.h>
>
> -extern u64 relocated_ramdisk;
> -
> /* Interrupt control for vSMPowered x86_64 systems */
> #ifdef CONFIG_X86_64
> void vsmp_init(void);
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index 1526747bedf2..ec2c21a1844e 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -226,8 +226,6 @@ static void __init reserve_brk(void)
> _brk_start = 0;
> }
>
> -u64 relocated_ramdisk;
> -
> #ifdef CONFIG_BLK_DEV_INITRD
>
> static u64 __init get_ramdisk_image(void)
> @@ -261,7 +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 */
> - relocated_ramdisk = memblock_phys_alloc_range(area_size, PAGE_SIZE, 0,
> + u64 relocated_ramdisk = memblock_phys_alloc_range(area_size, PAGE_SIZE, 0,
> PFN_PHYS(max_pfn_mapped));
> if (!relocated_ramdisk)
> panic("Cannot find place for new RAMDISK of size %lld\n",
> --
> 2.42.1
>
next prev parent reply other threads:[~2023-11-13 5:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-13 3:40 [PATCH] x86/setup: Make relocated_ramdisk a local variable of relocate_initrd() Yuntao Wang
2023-11-13 5:00 ` Baoquan He [this message]
2023-11-13 8:32 ` [tip: x86/cleanups] " tip-bot2 for Yuntao Wang
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=ZVGtclq4f33e/TWZ@MiWiFi-R3L-srv \
--to=bhe@redhat.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=jpoimboe@kernel.org \
--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 \
--cc=ytcoode@gmail.com \
/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