Messages in this thread | | | Date | Mon, 13 Nov 2023 13:00:34 +0800 | From | Baoquan He <> | Subject | Re: [PATCH] x86/setup: Make relocated_ramdisk a local variable of relocate_initrd() |
| |
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 >
| |