debuggers.hg

changeset 21158:f46055ab176a

Fix 32bit PAE compilation error introduced by 1GB patches

Signed-off-by: Wei Huang2 <wei.huang2@amd.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Apr 07 08:15:33 2010 +0100 (2010-04-07)
parents 986d3b1d30fb
children 3895f8e0e633
files xen/arch/x86/mm/p2m.c
line diff
     1.1 --- a/xen/arch/x86/mm/p2m.c	Wed Apr 07 08:14:34 2010 +0100
     1.2 +++ b/xen/arch/x86/mm/p2m.c	Wed Apr 07 08:15:33 2010 +0100
     1.3 @@ -1534,12 +1534,15 @@ static mfn_t p2m_gfn_to_mfn_current(unsi
     1.4      {
     1.5          l1_pgentry_t l1e = l1e_empty(), *p2m_entry;
     1.6          l2_pgentry_t l2e = l2e_empty();
     1.7 +        int ret;
     1.8 +#if CONFIG_PAGING_LEVELS >= 4
     1.9          l3_pgentry_t l3e = l3e_empty();
    1.10 -        int ret;
    1.11 +#endif
    1.12  
    1.13          ASSERT(gfn < (RO_MPT_VIRT_END - RO_MPT_VIRT_START) 
    1.14                 / sizeof(l1_pgentry_t));
    1.15  
    1.16 +#if CONFIG_PAGING_LEVELS >= 4
    1.17          /*
    1.18           * Read & process L3
    1.19           */
    1.20 @@ -1585,7 +1588,7 @@ static mfn_t p2m_gfn_to_mfn_current(unsi
    1.21              
    1.22              goto out;
    1.23          }
    1.24 -
    1.25 +#endif
    1.26          /*
    1.27           * Read & process L2
    1.28           */