From mboxrd@z Thu Jan  1 00:00:00 1970
From: Wei Huang <wei.huang2@amd.com>
Subject: [PATCH]Fix 32bit PAE compilation error introduced by
	1GB patches
Date: Tue, 6 Apr 2010 15:09:24 -0500
Message-ID: <4BBB94F4.2090503@amd.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------010106040100020306010805"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: "'xen-devel@lists.xensource.com'" <xen-devel@lists.xensource.com>, Keir Fraser <keir.fraser@eu.citrix.com>
List-Id: xen-devel@lists.xenproject.org

--------------010106040100020306010805
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit

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>



--------------010106040100020306010805
Content-Type: text/plain; name="fix_1gb_pae_compilation_error.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="fix_1gb_pae_compilation_error.txt"

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
          */

--------------010106040100020306010805
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--------------010106040100020306010805--