From: Andrew Cooper Date: Fri, 15 Jul 2016 18:34:00 +0000 (+0100) Subject: x86/mm: Clean up the construction of base_disallow_mask X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~654 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6eec5bd4dbb47017839e9ee2340d56c222e11a65;p=xen.git x86/mm: Clean up the construction of base_disallow_mask * Use _PAGE_AVAIL_HIGH and _PAGE_NX instead of opencoding them * Drop further remenants of the 32bit hypervisor build Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 56ca19f033..109b8bee8d 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -271,14 +271,13 @@ void __init arch_init_memory(void) { unsigned long i, pfn, rstart_pfn, rend_pfn, iostart_pfn, ioend_pfn; - /* Basic guest-accessible flags: PRESENT, R/W, USER, A/D, AVAIL[0,1,2] */ - base_disallow_mask = ~(_PAGE_PRESENT|_PAGE_RW|_PAGE_USER| - _PAGE_ACCESSED|_PAGE_DIRTY|_PAGE_AVAIL); - /* Allow guest access to the NX flag if hardware supports it. */ - if ( cpu_has_nx ) - base_disallow_mask &= ~_PAGE_NX_BIT; - /* On x86/64, range [62:52] is available for guest software use. */ - base_disallow_mask &= ~get_pte_flags((intpte_t)0x7ff << 52); + /* + * Basic guest-accessible flags: + * PRESENT, R/W, USER, A/D, AVAIL[0,1,2], AVAIL_HIGH, NX (if available). + */ + base_disallow_mask = + ~(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | + _PAGE_DIRTY | _PAGE_AVAIL | _PAGE_AVAIL_HIGH | _PAGE_NX); /* * Initialise our DOMID_XEN domain.