diff -rN -u -p old-xen-64-4/xen/arch/x86/mm.c new-xen-64-4/xen/arch/x86/mm.c --- old-xen-64-4/xen/arch/x86/mm.c 2005-05-31 16:15:06.000000000 +0000 +++ new-xen-64-4/xen/arch/x86/mm.c 2005-05-31 16:47:32.000000000 +0000 @@ -103,6 +103,7 @@ #include #include +#define VERBOSE 1 #ifdef VERBOSE #define MEM_LOG(_f, _a...) \ printk("DOM%u: (file=mm.c, line=%d) " _f "\n", \ @@ -446,7 +447,7 @@ get_page_from_l1e( if ( unlikely(l1e_get_flags(l1e) & L1_DISALLOW_MASK) ) { - MEM_LOG("Bad L1 flags %x\n", l1e_get_flags(l1e) & L1_DISALLOW_MASK); + MEM_LOG("Bad L1 flags %lx\n", l1e_get_flags(l1e) & L1_DISALLOW_MASK); return 0; } @@ -492,7 +493,7 @@ get_page_from_l2e( if ( unlikely((l2e_get_flags(l2e) & L2_DISALLOW_MASK)) ) { - MEM_LOG("Bad L2 flags %x\n", l2e_get_flags(l2e) & L2_DISALLOW_MASK); + MEM_LOG("Bad L2 flags %lx\n", l2e_get_flags(l2e) & L2_DISALLOW_MASK); return 0; } @@ -525,7 +526,7 @@ get_page_from_l3e( if ( unlikely((l3e_get_flags(l3e) & L3_DISALLOW_MASK)) ) { - MEM_LOG("Bad L3 flags %x\n", l3e_get_flags(l3e) & L3_DISALLOW_MASK); + MEM_LOG("Bad L3 flags %lx\n", l3e_get_flags(l3e) & L3_DISALLOW_MASK); return 0; } @@ -558,7 +559,7 @@ get_page_from_l4e( if ( unlikely((l4e_get_flags(l4e) & L4_DISALLOW_MASK)) ) { - MEM_LOG("Bad L4 flags %x\n", l4e_get_flags(l4e) & L4_DISALLOW_MASK); + MEM_LOG("Bad L4 flags %lx\n", l4e_get_flags(l4e) & L4_DISALLOW_MASK); return 0; } diff -rN -u -p old-xen-64-4/xen/include/asm-x86/x86_64/page.h new-xen-64-4/xen/include/asm-x86/x86_64/page.h --- old-xen-64-4/xen/include/asm-x86/x86_64/page.h 2005-05-31 16:15:06.000000000 +0000 +++ new-xen-64-4/xen/include/asm-x86/x86_64/page.h 2005-05-31 16:50:24.000000000 +0000 @@ -61,12 +61,12 @@ typedef l4_pgentry_t root_pgentry_t; #define get_pte_flags(x) ((int)((x) >> 40) | ((int)(x) & 0xFFF)) #define put_pte_flags(x) ((((intpte_t)((x) & ~0xFFF)) << 40) | ((x) & 0xFFF)) -#define _PAGE_NX (cpu_has_nx ? (1U<<23) : 0U) +#define _PAGE_NX (cpu_has_nx ? (1UL<<63) : 0UL) -#define L1_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) /* PAT/GLOBAL */ -#define L2_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) /* PSE/GLOBAL */ -#define L3_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) /* must-be-zero */ -#define L4_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) /* must-be-zero */ +#define L1_DISALLOW_MASK _PAGE_NX +#define L2_DISALLOW_MASK _PAGE_NX +#define L3_DISALLOW_MASK _PAGE_NX +#define L4_DISALLOW_MASK _PAGE_NX #endif /* __X86_64_PAGE_H__ */