1.1 --- a/xen/include/asm-x86/x86_32/page-2level.h	Wed Jun 22 17:40:09 2005 +0000
     1.2 +++ b/xen/include/asm-x86/x86_32/page-2level.h	Wed Jun 22 17:42:58 2005 +0000
     1.3 @@ -46,6 +46,8 @@ typedef l2_pgentry_t root_pgentry_t;
     1.4   *  12-bit flags = (pte[11:0])
     1.5   */
     1.6  
     1.7 +#define _PAGE_NX                0U
     1.8 +
     1.9  /* Extract flags into 12-bit integer, or turn 12-bit flags into a pte mask. */
    1.10  #define get_pte_flags(x) ((int)(x) & 0xFFF)
    1.11  #define put_pte_flags(x) ((intpte_t)((x) & 0xFFF))

     2.1 --- a/xen/include/asm-x86/x86_32/page-3level.h	Wed Jun 22 17:40:09 2005 +0000
     2.2 +++ b/xen/include/asm-x86/x86_32/page-3level.h	Wed Jun 22 17:42:58 2005 +0000
     2.3 @@ -59,6 +59,8 @@ typedef l3_pgentry_t root_pgentry_t;
     2.4   *  32-bit flags = (pte[63:44],pte[11:0])
     2.5   */
     2.6  
     2.7 +#define _PAGE_NX (cpu_has_nx ? (1<<31) : 0)
     2.8 +
     2.9  /* Extract flags into 32-bit integer, or turn 32-bit flags into a pte mask. */
    2.10  #define get_pte_flags(x) (((int)((x) >> 32) & ~0xFFF) | ((int)(x) & 0xFFF))
    2.11  #define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 40) | ((x) & 0xFFF))

     3.1 --- a/xen/include/asm-x86/x86_32/page.h	Wed Jun 22 17:40:09 2005 +0000
     3.2 +++ b/xen/include/asm-x86/x86_32/page.h	Wed Jun 22 17:42:58 2005 +0000
     3.3 @@ -7,8 +7,6 @@
     3.4  #define VADDR_BITS              32
     3.5  #define VADDR_MASK              (~0UL)
     3.6  
     3.7 -#define _PAGE_NX                0U
     3.8 -
     3.9  #include <xen/config.h>
    3.10  #ifdef CONFIG_X86_PAE
    3.11  # include <asm/x86_32/page-3level.h>