[Xen-changelog] [linux-2.6.18-xen] linux/i386-pae: fix __pte_ma()

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1204738056 0
# Node ID 3e732c70d5e96e0df8bf997cfc1287725e555021
# Parent  e56eb4ff7606626aada0352a0f8a1f1c9bc4d071
linux/i386-pae: fix __pte_ma()

While at present there's no use of the macro that would suffer from
this problem, this is a latent bug and should therefore be fixed (just
like __pte() in the native kernel).

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 include/asm-i386/mach-xen/asm/maddr.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -r e56eb4ff7606 -r 3e732c70d5e9 include/asm-i386/mach-xen/asm/maddr.h
--- a/include/asm-i386/mach-xen/asm/maddr.h     Wed Mar 05 17:27:09 2008 +0000
+++ b/include/asm-i386/mach-xen/asm/maddr.h     Wed Mar 05 17:27:36 2008 +0000
@@ -154,6 +154,7 @@ static inline paddr_t pte_machine_to_phy
 #endif
 
 #ifdef CONFIG_X86_PAE
+#define __pte_ma(x)    ((pte_t) { (x), (x) >> 32 } )
 static inline pte_t pfn_pte_ma(unsigned long page_nr, pgprot_t pgprot)
 {
        pte_t pte;
@@ -166,10 +167,9 @@ static inline pte_t pfn_pte_ma(unsigned 
        return pte;
 }
 #else
+#define __pte_ma(x)    ((pte_t) { (x) } )
 #define pfn_pte_ma(pfn, prot)  __pte_ma(((pfn) << PAGE_SHIFT) | 
pgprot_val(prot))
 #endif
-
-#define __pte_ma(x)    ((pte_t) { (x) } )
 
 #else /* !CONFIG_XEN */
 

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