]> xenbits.xensource.com Git - xenclient/kernel.git/commitdiff
fix native build after c/s 338
authorKeir Fraser <keir.fraser@citrix.com>
Mon, 10 Dec 2007 11:52:07 +0000 (11:52 +0000)
committerKeir Fraser <keir.fraser@citrix.com>
Mon, 10 Dec 2007 11:52:07 +0000 (11:52 +0000)
Signed-off-by: Jan Beulich <jbeulich@novell.com>
mm/memory.c

index ceb0d35147394e0b9a383c3be873578004df7ee7..739673891a322d982841297873e5e18cb49d44aa 100644 (file)
@@ -396,9 +396,11 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_
                        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,