diff options
| author | Keir Fraser <keir@xen.org> | 2011-03-28 13:44:08 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-03-28 13:44:08 +0100 |
| commit | ed1dec3b310771603bab8b84b4e6e183312eb0c4 (patch) | |
| tree | 95054ecf395fe6c20695291625ec34f6505744a1 /xen/include/asm-x86/x86_64 | |
| parent | 09933ee55d2ae2592d66ee9c6f92a2e139625061 (diff) | |
| download | xen-ed1dec3b310771603bab8b84b4e6e183312eb0c4.tar.gz xen-ed1dec3b310771603bab8b84b4e6e183312eb0c4.tar.bz2 xen-ed1dec3b310771603bab8b84b4e6e183312eb0c4.zip | |
x86: Remove _PAGE_NX defintiion (with implicit use of cpu_has_nx).
Most users can use _PAGE_NX_BIT directly.
The few genuine users in mm.c can do the cpu_has_nx check more clearly
in other ways.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/include/asm-x86/x86_64')
| -rw-r--r-- | xen/include/asm-x86/x86_64/page.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 8e58c9b9eb..38edb91bf3 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -154,25 +154,10 @@ typedef l4_pgentry_t root_pgentry_t; /* Bit 23 of a 24-bit flag mask. This corresponds to bit 63 of a pte.*/ #define _PAGE_NX_BIT (1U<<23) -#define _PAGE_NX (cpu_has_nx ? _PAGE_NX_BIT : 0U) /* Bit 22 of a 24-bit flag mask. This corresponds to bit 62 of a pte.*/ #define _PAGE_GNTTAB (1U<<22) -/* - * Disallow unused flag bits plus PAT/PSE, PCD, PWT and GLOBAL. - * Permit the NX bit if the hardware supports it. - * Note that range [62:52] is available for software use on x86/64. - */ -#define BASE_DISALLOW_MASK (0xFF800198U & ~_PAGE_NX) - -#define L1_DISALLOW_MASK (BASE_DISALLOW_MASK | _PAGE_GNTTAB) -#define L2_DISALLOW_MASK (BASE_DISALLOW_MASK & ~_PAGE_PSE) -#define L3_DISALLOW_MASK (BASE_DISALLOW_MASK) -#define L4_DISALLOW_MASK (BASE_DISALLOW_MASK) - -#define COMPAT_L3_DISALLOW_MASK 0xFFFFF198U - #define PAGE_HYPERVISOR (__PAGE_HYPERVISOR | _PAGE_GLOBAL) #define PAGE_HYPERVISOR_NOCACHE (__PAGE_HYPERVISOR_NOCACHE | _PAGE_GLOBAL) @@ -184,9 +169,6 @@ typedef l4_pgentry_t root_pgentry_t; * is asserted for both. */ #define _PAGE_GUEST_KERNEL (1U<<12) -/* Global bit is allowed to be set on L1 PTEs. Intended for user mappings. */ -#undef L1_DISALLOW_MASK -#define L1_DISALLOW_MASK ((BASE_DISALLOW_MASK | _PAGE_GNTTAB) & ~_PAGE_GLOBAL) #else #define _PAGE_GUEST_KERNEL 0 #endif |