[Xen-changelog] [xen-unstable] linux: Fix backward compatibility in page table handling

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1172498948 0
# Node ID 9be2dec913b71c9951aa8e3d6ea1ed9e37c8fc1c
# Parent  720afbf740018c55ce984c09bbc61dbeb4f0d74e
linux: Fix backward compatibility in page table handling

A 3.0.2 compatibility requirement slipped my attention before
submitting the original page table handling changes.

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

diff -r 720afbf74001 -r 9be2dec913b7 
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 
13:56:01 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Mon Feb 26 
14:09:08 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