[PATCH 1/2] x86/xen: move xen_reserve_extra_memory()

[Roger Pau Monne <roger.pau@xxxxxxxxxx>]

In preparation for making the function static.

No functional change.

Fixes: 38620fc4e893 ('x86/xen: attempt to inflate the memory balloon on PVH')
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Since this is a pre-requisite for a bugfix, I've tagged it with "Fixes:", not
sure if that's appropriate or there's some better tag to use.
---
 arch/x86/xen/enlighten_pvh.c | 96 ++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c
index 27a2a02ef8fb..91c6db4ec054 100644
--- a/arch/x86/xen/enlighten_pvh.c
+++ b/arch/x86/xen/enlighten_pvh.c
@@ -27,54 +27,6 @@
 bool __ro_after_init xen_pvh;
 EXPORT_SYMBOL_GPL(xen_pvh);
 
-void __init xen_pvh_init(struct boot_params *boot_params)
-{
-       u32 msr;
-       u64 pfn;
-
-       xen_pvh = 1;
-       xen_domain_type = XEN_HVM_DOMAIN;
-       xen_start_flags = pvh_start_info.flags;
-
-       msr = cpuid_ebx(xen_cpuid_base() + 2);
-       pfn = __pa(hypercall_page);
-       wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));
-
-       if (xen_initial_domain())
-               x86_init.oem.arch_setup = xen_add_preferred_consoles;
-       x86_init.oem.banner = xen_banner;
-
-       xen_efi_init(boot_params);
-
-       if (xen_initial_domain()) {
-               struct xen_platform_op op = {
-                       .cmd = XENPF_get_dom0_console,
-               };
-               int ret = HYPERVISOR_platform_op(&op);
-
-               if (ret > 0)
-                       xen_init_vga(&op.u.dom0_console,
-                                    min(ret * sizeof(char),
-                                        sizeof(op.u.dom0_console)),
-                                    &boot_params->screen_info);
-       }
-}
-
-void __init mem_map_via_hcall(struct boot_params *boot_params_p)
-{
-       struct xen_memory_map memmap;
-       int rc;
-
-       memmap.nr_entries = ARRAY_SIZE(boot_params_p->e820_table);
-       set_xen_guest_handle(memmap.buffer, boot_params_p->e820_table);
-       rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
-       if (rc) {
-               xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);
-               BUG();
-       }
-       boot_params_p->e820_entries = memmap.nr_entries;
-}
-
 /*
  * Reserve e820 UNUSABLE regions to inflate the memory balloon.
  *
@@ -141,3 +93,51 @@ void __init xen_reserve_extra_memory(struct boot_params 
*bootp)
                xen_add_extra_mem(PFN_UP(e->addr), pages);
        }
 }
+
+void __init xen_pvh_init(struct boot_params *boot_params)
+{
+       u32 msr;
+       u64 pfn;
+
+       xen_pvh = 1;
+       xen_domain_type = XEN_HVM_DOMAIN;
+       xen_start_flags = pvh_start_info.flags;
+
+       msr = cpuid_ebx(xen_cpuid_base() + 2);
+       pfn = __pa(hypercall_page);
+       wrmsr_safe(msr, (u32)pfn, (u32)(pfn >> 32));
+
+       if (xen_initial_domain())
+               x86_init.oem.arch_setup = xen_add_preferred_consoles;
+       x86_init.oem.banner = xen_banner;
+
+       xen_efi_init(boot_params);
+
+       if (xen_initial_domain()) {
+               struct xen_platform_op op = {
+                       .cmd = XENPF_get_dom0_console,
+               };
+               int ret = HYPERVISOR_platform_op(&op);
+
+               if (ret > 0)
+                       xen_init_vga(&op.u.dom0_console,
+                                    min(ret * sizeof(char),
+                                        sizeof(op.u.dom0_console)),
+                                    &boot_params->screen_info);
+       }
+}
+
+void __init mem_map_via_hcall(struct boot_params *boot_params_p)
+{
+       struct xen_memory_map memmap;
+       int rc;
+
+       memmap.nr_entries = ARRAY_SIZE(boot_params_p->e820_table);
+       set_xen_guest_handle(memmap.buffer, boot_params_p->e820_table);
+       rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
+       if (rc) {
+               xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc);
+               BUG();
+       }
+       boot_params_p->e820_entries = memmap.nr_entries;
+}
-- 
2.45.2