From: "Jan Beulich" <jbeulich@novell.com>
Subject: [PATCH] linux: fix native build after c/s 338
Date: Mon, 10 Dec 2007 11:46:21 +0000
Message-ID: <475D351D.76E4.0078.0@novell.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: sle10sp2-2007-12-10/mm/memory.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sle10sp2-2007-12-10.orig/mm/memory.c	2007-12-10 12:35:41.0000000=
00 +0100
+++ sle10sp2-2007-12-10/mm/memory.c	2007-12-10 12:36:14.000000000 =
+0100
@@ -396,9 +396,11 @@ struct page *vm_normal_page(struct vm_ar
 			return NULL;
 	}
=20
+#ifdef CONFIG_XEN
 	/* XEN: Covers user-space grant mappings (even of local pages). */
 	if (unlikely(vma->vm_flags & VM_FOREIGN))
 		return NULL;
+#endif
=20
 	/*
 	 * Add some anal sanity checks for now. Eventually,