From: "Jan Beulich" Subject: [PATCH] linux/i386: Use normal set_pmd() in vmalloc_sync_one() on modern Xen Date: Thu, 22 Nov 2007 13:11:30 +0000 Message-ID: <47458E12.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-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 As usual, written and tested against 2.6.23 and made apply against 2.6.18 without further testing. Signed-off-by: Jan Beulich Index: head-2007-10-26/arch/i386/mm/fault-xen.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 --- head-2007-10-26.orig/arch/i386/mm/fault-xen.c 2007-10-19 = 10:57:16.000000000 +0200 +++ head-2007-10-26/arch/i386/mm/fault-xen.c 2007-11-21 15:13:53.0000000= 00 +0100 @@ -348,11 +348,11 @@ static inline pmd_t *vmalloc_sync_one(pg if (!pmd_present(*pmd_k)) return NULL; if (!pmd_present(*pmd)) -#ifndef CONFIG_XEN +#if CONFIG_XEN_COMPAT > 0x030002 set_pmd(pmd, *pmd_k); #else /* - * When running on Xen we must launder *pmd_k through + * When running on older Xen we must launder *pmd_k = through * pmd_val() to ensure that _PAGE_PRESENT is correctly = set. */ set_pmd(pmd, __pmd(pmd_val(*pmd_k)));