From: Stefano Stabellini Date: Tue, 13 Nov 2018 16:59:45 +0000 (-0800) Subject: xen/arm: rename allocate_memory to allocate_memory_11 X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2944 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bfeb4a56485b972faaa70e43d7ff945d14fb07fc;p=xen.git xen/arm: rename allocate_memory to allocate_memory_11 allocate_memory only deals with directly mapped memory. Rename it to allocate_memory_11. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index ca0c4f786e..66a258ab9c 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -243,7 +243,8 @@ fail: * (as described above) we allow higher allocations and continue until * that runs out (or we have allocated sufficient dom0 memory). */ -static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo) +static void __init allocate_memory_11(struct domain *d, + struct kernel_info *kinfo) { const unsigned int min_low_order = get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128))); @@ -2152,7 +2153,7 @@ int __init construct_dom0(struct domain *d) #endif - allocate_memory(d, &kinfo); + allocate_memory_11(d, &kinfo); find_gnttab_region(d, &kinfo); /* Map extra GIC MMIO, irqs and other hw stuffs to dom0. */