[PATCH]Fix 32bit PAE compilation error introduced by 1GB patches

[PATCH]Fix 32bit PAE compilation error introduced by 1GB patches

[Wei Huang]

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

Keir,

The 1GB patches broken 32bit PAE build. Very sorry about it. The 
attached is the patch to fix compilation for 32bit PAE.

Thanks,
-Wei

Signed-off-by: Wei Huang2 <wei.huang2@amd.com>



[-- Attachment #2: fix_1gb_pae_compilation_error.txt --]
[-- Type: text/plain, Size: 729 bytes --]

diff -r adce8bc43fcc xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c	Tue Apr 06 07:16:47 2010 +0100
+++ b/xen/arch/x86/mm/p2m.c	Tue Apr 06 09:03:57 2010 -0500
@@ -1534,12 +1534,15 @@
     {
         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 @@
             
             goto out;
         }
-
+#endif
         /*
          * Read & process L2
          */

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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