From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 10 Dec 2007 11:52:07 +0000 (+0000)
Subject: fix native build after c/s 338
X-Git-Tag: xen-3.2.0~21^2^2~28^2^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=860c31d3c474356ddb4b40910ca6543068a895da;p=xenclient%2Fkernel.git

fix native build after c/s 338
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/mm/memory.c b/mm/memory.c
index ceb0d351..73967389 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -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,