From: Chris Brand Date: Thu, 10 Sep 2015 18:56:28 +0000 (-0700) Subject: xen: arm re-order assignments in mfn_to_xen_entry() X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2551 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a3a2dad62ad647a0d32a4560eb24ffc005221fbc;p=xen.git xen: arm re-order assignments in mfn_to_xen_entry() Shuffle lines around so that the assignments in mfn_to_xen_entry() occur in the same order as the bits are declared in lpae_pt_t. This makes it easier to see which ones are never given a value. No change in behaviour. Also fix a minor comment typo. Signed-off-by: Chris Brand Reviewed-by: Julien Grall Acked-by: Ian Campbell --- diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 5ecfd0705e..01628f3e96 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -197,18 +197,18 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) paddr_t pa = ((paddr_t) mfn) << PAGE_SHIFT; lpae_t e = (lpae_t) { .pt = { - .xn = 1, /* No need to execute outside .text */ - .ng = 1, /* Makes TLB flushes easier */ - .af = 1, /* No need for access tracking */ + .valid = 1, /* Mappings are present */ + .table = 0, /* Set to 1 for links and 4k maps */ + .ai = attr, .ns = 1, /* Hyp mode is in the non-secure world */ .user = 1, /* See below */ - .ai = attr, - .table = 0, /* Set to 1 for links and 4k maps */ - .valid = 1, /* Mappings are present */ + .af = 1, /* No need for access tracking */ + .ng = 1, /* Makes TLB flushes easier */ + .xn = 1, /* No need to execute outside .text */ }};; /* Setting the User bit is strange, but the ATS1H[RW] instructions * don't seem to work otherwise, and since we never run on Xen - * pagetables un User mode it's OK. If this changes, remember + * pagetables in User mode it's OK. If this changes, remember * to update the hard-coded values in head.S too */ switch ( attr )