From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764779AbYETJJl (ORCPT ); Tue, 20 May 2008 05:09:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762065AbYETJG6 (ORCPT ); Tue, 20 May 2008 05:06:58 -0400 Received: from gw.goop.org ([64.81.55.164]:44084 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762191AbYETJG4 (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 8 of 8] xen: use PTE_MASK in pte_mfn() X-Mercurial-Node: 97f60002c43b392c5e452a67b7cec01320a653cd Message-Id: <97f60002c43b392c5e45.1211268384@localhost> In-Reply-To: Date: Tue, 20 May 2008 08:26:24 +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 mfn from pte. Signed-off-by: Jeremy Fitzhardinge --- include/asm-x86/xen/page.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h --- a/include/asm-x86/xen/page.h +++ b/include/asm-x86/xen/page.h @@ -127,7 +127,7 @@ static inline unsigned long pte_mfn(pte_t pte) { - return (pte.pte & ~_PAGE_NX) >> PAGE_SHIFT; + return (pte.pte & PTE_MASK) >> PAGE_SHIFT; } static inline pte_t mfn_pte(unsigned long page_nr, pgprot_t pgprot)