From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761935AbYARNym (ORCPT ); Fri, 18 Jan 2008 08:54:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761695AbYARNy1 (ORCPT ); Fri, 18 Jan 2008 08:54:27 -0500 Received: from extu-mxob-1.symantec.com ([216.10.194.28]:52839 "EHLO extu-mxob-1.symantec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761684AbYARNy0 (ORCPT ); Fri, 18 Jan 2008 08:54:26 -0500 Date: Fri, 18 Jan 2008 13:52:33 +0000 (GMT) From: Hugh Dickins X-X-Sender: hugh@blonde.site To: Jeremy Fitzhardinge cc: Ingo Molnar , LKML , Andi Kleen , Glauber de Oliveira Costa , Jan Beulich Subject: Re: [PATCH 4 of 4] x86: mask NX from pte_pfn In-Reply-To: Message-ID: References: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 15 Jan 2008, Jeremy Fitzhardinge wrote: > In 32-bit PAE, mask NX from pte_pfn, since it isn't part of the PFN. > This code is due for unification anyway, but this fixes a latent bug. > > Signed-off-by: Jeremy Fitzhardinge > > --- > include/asm-x86/pgtable-3level.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/asm-x86/pgtable-3level.h b/include/asm-x86/pgtable-3level.h > --- a/include/asm-x86/pgtable-3level.h > +++ b/include/asm-x86/pgtable-3level.h > @@ -139,7 +139,7 @@ static inline int pte_none(pte_t pte) > > static inline unsigned long pte_pfn(pte_t pte) > { > - return pte_val(pte) >> PAGE_SHIFT; > + return (pte_val(pte) >> PAGE_SHIFT) & ~_PAGE_NX; > } > > /* Shouldn't that be return (pte_val(pte) & ~_PAGE_NX) >> PAGE_SHIFT; ? Hugh