[Xen-changelog] [xen-unstable] Merge

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1172501326 0
# Node ID ca1dd348054021b42d47af5a7f5ad808272d3233
# Parent  90f37b1748a8481355c24a22acfd1aeec108f094
# Parent  9be2dec913b71c9951aa8e3d6ea1ed9e37c8fc1c
Merge
---
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h |    4 ++++
 1 files changed, 4 insertions(+)

diff -r 90f37b1748a8 -r ca1dd3480540 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Mon Feb 26 
14:47:54 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Mon Feb 26 
14:48:46 2007 +0000
@@ -139,7 +139,11 @@ static inline unsigned long pgd_val(pgd_
 static inline unsigned long pgd_val(pgd_t x)
 {
        unsigned long ret = x.pgd;
+#ifdef CONFIG_XEN_COMPAT_030002
+       if (ret) ret = machine_to_phys(ret) | _PAGE_PRESENT;
+#else
        if (ret & _PAGE_PRESENT) ret = machine_to_phys(ret);
+#endif
        return ret;
 }
 #define HPAGE_SHIFT    22

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