ia64/xen-unstable

changeset 9087:b0dfd76ef5d2

Revert two uses of CONFIG_PAGING_LEVELS to CPP rather than C predicate.
Fixes PAE and 64-bit builds.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Mar 01 23:35:55 2006 +0100 (2006-03-01)
parents e0f66dbe4b13
children 072d51860554
files xen/arch/x86/mm.c
line diff
     1.1 --- a/xen/arch/x86/mm.c	Wed Mar 01 18:34:06 2006 +0100
     1.2 +++ b/xen/arch/x86/mm.c	Wed Mar 01 23:35:55 2006 +0100
     1.3 @@ -506,10 +506,10 @@ get_page_from_l2e(
     1.4      vaddr <<= PGT_va_shift;
     1.5      rc = get_page_and_type_from_pagenr(
     1.6          l2e_get_pfn(l2e), PGT_l1_page_table | vaddr, d);
     1.7 -
     1.8 -    if ( (CONFIG_PAGING_LEVELS == 2) && unlikely(!rc) )
     1.9 +#if CONFIG_PAGING_LEVELS == 2
    1.10 +    if ( unlikely(!rc) )
    1.11          rc = get_linear_pagetable(l2e, pfn, d);
    1.12 -
    1.13 +#endif
    1.14      return rc;
    1.15  }
    1.16  
    1.17 @@ -538,10 +538,10 @@ get_page_from_l3e(
    1.18      rc = get_page_and_type_from_pagenr(
    1.19          l3e_get_pfn(l3e),
    1.20          PGT_l2_page_table | vaddr, d);
    1.21 -
    1.22 -    if ( (CONFIG_PAGING_LEVELS == 3) && unlikely(!rc) )
    1.23 +#if CONFIG_PAGING_LEVELS == 3
    1.24 +    if ( unlikely(!rc) )
    1.25          rc = get_linear_pagetable(l3e, pfn, d);
    1.26 -
    1.27 +#endif
    1.28      return rc;
    1.29  }
    1.30  #endif /* 3 level */