From: Julien Grall Date: Thu, 15 Sep 2016 11:28:26 +0000 (+0100) Subject: xen/arm: p2m: Move the lookup helpers at the top of the file X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~332 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=31b2e5cfd596307aa1c037532d2beeeb66017910;p=xen.git xen/arm: p2m: Move the lookup helpers at the top of the file This will be used later in functions that will be defined earlier in the file. Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Tested-by: Tamas K Lengyel --- diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 587ce5b241..6a100c81df 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -29,6 +29,14 @@ static unsigned int __read_mostly p2m_root_level; unsigned int __read_mostly p2m_ipa_bits; +/* Helpers to lookup the properties of each level */ +static const paddr_t level_sizes[] = + { ZEROETH_SIZE, FIRST_SIZE, SECOND_SIZE, THIRD_SIZE }; +static const paddr_t level_masks[] = + { ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK }; +static const uint8_t level_shifts[] = + { ZEROETH_SHIFT, FIRST_SHIFT, SECOND_SHIFT, THIRD_SHIFT }; + static bool_t p2m_valid(lpae_t pte) { return pte.p2m.valid; @@ -682,14 +690,6 @@ static bool_t is_mapping_aligned(const paddr_t start_gpaddr, #define P2M_ONE_PROGRESS_NOP 0x1 #define P2M_ONE_PROGRESS 0x10 -/* Helpers to lookup the properties of each level */ -static const paddr_t level_sizes[] = - { ZEROETH_SIZE, FIRST_SIZE, SECOND_SIZE, THIRD_SIZE }; -static const paddr_t level_masks[] = - { ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK }; -static const uint8_t level_shifts[] = - { ZEROETH_SHIFT, FIRST_SHIFT, SECOND_SHIFT, THIRD_SHIFT }; - static int p2m_shatter_page(struct p2m_domain *p2m, lpae_t *entry, unsigned int level)