diff options
| author | Roger Pau Monne <roger.pau@citrix.com> | 2024-07-25 09:31:15 +0200 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2024-07-25 13:11:08 +0200 |
| commit | 4c006734898a113a64a528027274a571b04af95a (patch) | |
| tree | bb2cbb8b5571b66d8a249657d83b32530d674262 /arch/x86/platform | |
| parent | x86/xen: move xen_reserve_extra_memory() (diff) | |
| download | linux-4c006734898a113a64a528027274a571b04af95a.tar.xz linux-4c006734898a113a64a528027274a571b04af95a.zip | |
x86/xen: fix memblock_reserve() usage on PVH
The current usage of memblock_reserve() in init_pvh_bootparams() is done before
the .bss is zeroed, and that used to be fine when
memblock_reserved_init_regions implicitly ended up in the .meminit.data
section. However after commit 73db3abdca58c memblock_reserved_init_regions
ends up in the .bss section, thus breaking it's usage before the .bss is
cleared.
Move and rename the call to xen_reserve_extra_memory() so it's done in the
x86_init.oem.arch_setup hook, which gets executed after the .bss has been
zeroed, but before calling e820__memory_setup().
Fixes: 73db3abdca58c ("init/modpost: conditionally check section mismatch to __meminit*")
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Message-ID: <20240725073116.14626-3-roger.pau@citrix.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/pvh/enlighten.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/platform/pvh/enlighten.c b/arch/x86/platform/pvh/enlighten.c index 8c2d4b8de25d..944e0290f2c0 100644 --- a/arch/x86/platform/pvh/enlighten.c +++ b/arch/x86/platform/pvh/enlighten.c @@ -75,9 +75,6 @@ static void __init init_pvh_bootparams(bool xen_guest) } else xen_raw_printk("Warning: Can fit ISA range into e820\n"); - if (xen_guest) - xen_reserve_extra_memory(&pvh_bootparams); - pvh_bootparams.hdr.cmd_line_ptr = pvh_start_info.cmdline_paddr; |