Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1270624533 -3600
# Node ID f46055ab176a33efa1677be500a4578f9ef113e2
# Parent 986d3b1d30fb23e4eb777cfc1754e2542be529e7
Fix 32bit PAE compilation error introduced by 1GB patches

Signed-off-by: Wei Huang2 <wei.huang2@amd.com>
---
xen/arch/x86/mm/p2m.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff -r 986d3b1d30fb -r f46055ab176a xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c Wed Apr 07 08:14:34 2010 +0100
+++ b/xen/arch/x86/mm/p2m.c Wed Apr 07 08:15:33 2010 +0100
@@ -1534,12 +1534,15 @@ static mfn_t p2m_gfn_to_mfn_current(unsi
{
l1_pgentry_t l1e = l1e_empty(), *p2m_entry;
l2_pgentry_t l2e = l2e_empty();
+ int ret;
+#if CONFIG_PAGING_LEVELS >= 4
l3_pgentry_t l3e = l3e_empty();
- int ret;
+#endif

ASSERT(gfn < (RO_MPT_VIRT_END - RO_MPT_VIRT_START)
/ sizeof(l1_pgentry_t));

+#if CONFIG_PAGING_LEVELS >= 4
/*
* Read & process L3
*/
@@ -1585,7 +1588,7 @@ static mfn_t p2m_gfn_to_mfn_current(unsi

goto out;
}
-
+#endif
/*
* Read & process L2
*/

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog