From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764576AbYETJIk (ORCPT ); Tue, 20 May 2008 05:08:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762763AbYETJG4 (ORCPT ); Tue, 20 May 2008 05:06:56 -0400 Received: from gw.goop.org ([64.81.55.164]:44066 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762191AbYETJGz (ORCPT ); Tue, 20 May 2008 05:06:55 -0400 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [PATCH 5 of 8] x86: use PTE_MASK in pgtable_32.h X-Mercurial-Node: def260e5d02e2fc6604a0855a535c5a6ed36cbb8 Message-Id: In-Reply-To: Date: Tue, 20 May 2008 08:26:21 +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 --- include/asm-x86/pgtable_32.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h --- a/include/asm-x86/pgtable_32.h +++ b/include/asm-x86/pgtable_32.h @@ -88,7 +88,7 @@ /* To avoid harmful races, pmd_none(x) should check only the lower when PAE */ #define pmd_none(x) (!(unsigned long)pmd_val((x))) #define pmd_present(x) (pmd_val((x)) & _PAGE_PRESENT) -#define pmd_bad(x) ((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) +#define pmd_bad(x) ((pmd_val(x) & (~PTE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) @@ -159,7 +159,7 @@ #define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT)) #define pmd_page_vaddr(pmd) \ - ((unsigned long)__va(pmd_val((pmd)) & PAGE_MASK)) + ((unsigned long)__va(pmd_val((pmd)) & PTE_MASK)) #if defined(CONFIG_HIGHPTE) #define pte_offset_map(dir, address) \