[Xen-changelog] [linux-2.6.18-xen] fix native build after c/s 338

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1197287527 0
# Node ID cf9bc1ff6cde5523a41f56c0a1a54d6734b7aed3
# Parent  69d413abd6c067d688c693004f46f79d1169f0ce
fix native build after c/s 338
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 mm/memory.c |    2 ++
 1 files changed, 2 insertions(+)

diff -r 69d413abd6c0 -r cf9bc1ff6cde mm/memory.c
--- a/mm/memory.c       Fri Dec 07 00:38:40 2007 +0000
+++ b/mm/memory.c       Mon Dec 10 11:52:07 2007 +0000
@@ -396,9 +396,11 @@ struct page *vm_normal_page(struct vm_ar
                        return NULL;
        }
 
+#ifdef CONFIG_XEN
        /* XEN: Covers user-space grant mappings (even of local pages). */
        if (unlikely(vma->vm_flags & VM_FOREIGN))
                return NULL;
+#endif
 
        /*
         * Add some anal sanity checks for now. Eventually,

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