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

xen/arm: rename get_11_allocation_size to get_allocation_size

No functional changes.

Signed-off-by: Stefano Stabellini <***@xilinx.com>
Acked-by: Julien Grall <***@arm.com>
---
xen/arch/arm/domain_build.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 59c9f3471c..ca0c4f786e 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -77,7 +77,7 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0)
return vcpu_create(dom0, 0, 0);
}

-static unsigned int __init get_11_allocation_size(paddr_t size)
+static unsigned int __init get_allocation_size(paddr_t size)
{
/*
* get_order_from_bytes returns the order greater than or equal to
@@ -249,7 +249,7 @@ static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo)
get_order_from_bytes(min_t(paddr_t, dom0_mem, MB(128)));
const unsigned int min_order = get_order_from_bytes(MB(4));
struct page_info *pg;
- unsigned int order = get_11_allocation_size(kinfo->unassigned_mem);
+ unsigned int order = get_allocation_size(kinfo->unassigned_mem);
int i;

bool lowmem = true;
@@ -301,7 +301,7 @@ static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo)
* If we failed to allocate bank0 under 4GB, continue allocating
* memory from above 4GB and fill in banks.
*/
- order = get_11_allocation_size(kinfo->unassigned_mem);
+ order = get_allocation_size(kinfo->unassigned_mem);
while ( kinfo->unassigned_mem && kinfo->mem.nr_banks < NR_MEM_BANKS )
{
pg = alloc_domheap_pages(d, order, lowmem ? MEMF_bits(32) : 0);
@@ -312,7 +312,7 @@ static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo)
if ( lowmem && order < min_low_order)
{
D11PRINT("Failed at min_low_order, allow high allocations\n");
- order = get_11_allocation_size(kinfo->unassigned_mem);
+ order = get_allocation_size(kinfo->unassigned_mem);
lowmem = false;
continue;
}
@@ -332,7 +332,7 @@ static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo)
if ( lowmem )
{
D11PRINT("Allocation below bank 0, allow high allocations\n");
- order = get_11_allocation_size(kinfo->unassigned_mem);
+ order = get_allocation_size(kinfo->unassigned_mem);
lowmem = false;
continue;
}
@@ -347,7 +347,7 @@ static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo)
* Success, next time around try again to get the largest order
* allocation possible.
*/
- order = get_11_allocation_size(kinfo->unassigned_mem);
+ order = get_allocation_size(kinfo->unassigned_mem);
}

if ( kinfo->unassigned_mem )
--
generated by git-patchbot for /home/xen/git/xen.git#staging

Loading...