All of lore.kernel.org
 help / color / mirror / Atom feed
From: Wei Huang <wei.huang2@amd.com>
To: "'xen-devel@lists.xensource.com'" <xen-devel@lists.xensource.com>,
	Keir Fraser <keir.fraser@eu.citrix.com>
Subject: [PATCH]Fix 32bit PAE compilation error introduced by 1GB patches
Date: Tue, 6 Apr 2010 15:09:24 -0500	[thread overview]
Message-ID: <4BBB94F4.2090503@amd.com> (raw)

[-- 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

                 reply	other threads:[~2010-04-06 20:09 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4BBB94F4.2090503@amd.com \
    --to=wei.huang2@amd.com \
    --cc=keir.fraser@eu.citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.