1.1 --- a/xen/arch/x86/mm.c	Mon Jun 19 16:47:21 2006 +0100
     1.2 +++ b/xen/arch/x86/mm.c	Mon Jun 19 17:26:54 2006 +0100
     1.3 @@ -268,9 +268,9 @@ void share_xen_page_with_privileged_gues
     1.4  
     1.5  #if defined(CONFIG_X86_PAE)
     1.6  
     1.7 -#ifdef NDEBUG
     1.8 +#if 1 /*def NDEBUG*/ /* KAF: Non-debug case is suspect: let's always use it. */
     1.9  /* Only PDPTs above 4GB boundary need to be shadowed in low memory. */
    1.10 -#define l3tab_needs_shadow(mfn) (mfn >= 0x100000)
    1.11 +#define l3tab_needs_shadow(mfn) ((mfn) >= 0x100000)
    1.12  #else
    1.13  /*
    1.14   * In debug builds we aggressively shadow PDPTs to exercise code paths.
    1.15 @@ -278,9 +278,9 @@ void share_xen_page_with_privileged_gues
    1.16   * (detected by lack of an owning domain). Always shadow PDPTs above 4GB.
    1.17   */
    1.18  #define l3tab_needs_shadow(mfn)                         \
    1.19 -    ((((mfn << PAGE_SHIFT) != __pa(idle_pg_table)) &&   \
    1.20 +    (((((mfn) << PAGE_SHIFT) != __pa(idle_pg_table)) && \
    1.21        (page_get_owner(mfn_to_page(mfn)) != NULL)) ||    \
    1.22 -     (mfn >= 0x100000))
    1.23 +     ((mfn) >= 0x100000))
    1.24  #endif
    1.25  
    1.26  static l1_pgentry_t *fix_pae_highmem_pl1e;