From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932087AbYETJJS (ORCPT ); Tue, 20 May 2008 05:09:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1763390AbYETJG5 (ORCPT ); Tue, 20 May 2008 05:06:57 -0400 Received: from gw.goop.org ([64.81.55.164]:44080 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762703AbYETJG4 (ORCPT ); Tue, 20 May 2008 05:06:56 -0400 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 7 of 8] x86: use PTE_MASK rather than ad-hoc mask X-Mercurial-Node: 8bc0d3c383dc09d244500ea6931d4a5a1694d045 Message-Id: <8bc0d3c383dc09d24450.1211268383@localhost> In-Reply-To: Date: Tue, 20 May 2008 08:26:23 +0100 From: Jeremy Fitzhardinge To: Linus Torvalds Cc: Andrew Morton , Ingo Molnar , LKML , Thomas Gleixner , Hugh Dickins , Theodore Tso , Gabriel C , Keith Packard , "Pallipadi, Venkatesh" , Eric Anholt , "Siddha, Suresh B" , airlied@linux.ie, "Barnes, Jesse" , "Rafael J. Wysocki" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use ~PTE_MASK to extract the non-pfn parts of the pte (ie, the pte flags), rather than constructing an ad-hoc mask. Signed-off-by: Jeremy Fitzhardinge --- include/asm-x86/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h @@ -305,7 +305,7 @@ return __pgprot(preservebits | addbits); } -#define pte_pgprot(x) __pgprot(pte_val(x) & (0xfff | _PAGE_NX)) +#define pte_pgprot(x) __pgprot(pte_val(x) & ~PTE_MASK) #define canon_pgprot(p) __pgprot(pgprot_val(p) & __supported_pte_mask)