Discussion:
[Xen-changelog] [xen staging] xen/arm: rename allocate_memory to allocate_memory_11
p***@xen.org
2018-11-14 19:56:47 UTC
Permalink
commit bfeb4a56485b972faaa70e43d7ff945d14fb07fc
Author: Stefano Stabellini <***@kernel.org>
AuthorDate: Tue Nov 13 08:59:45 2018 -0800
Commit: Julien Grall <***@arm.com>
CommitDate: Wed Nov 14 19:34:47 2018 +0000

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 <***@xilinx.com>
Acked-by: Julien Grall <***@arm.com>
---
xen/arch/arm/domain_build.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

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. */
--
generated by git-patchbot for /home/xen/git/xen.git#staging

Loading...