From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755504AbYIHUFA (ORCPT ); Mon, 8 Sep 2008 16:05:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753672AbYIHUEw (ORCPT ); Mon, 8 Sep 2008 16:04:52 -0400 Received: from extu-mxob-2.symantec.com ([216.10.194.135]:55808 "EHLO extu-mxob-2.symantec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753425AbYIHUEv (ORCPT ); Mon, 8 Sep 2008 16:04:51 -0400 Date: Mon, 8 Sep 2008 21:04:34 +0100 (BST) From: Hugh Dickins X-X-Sender: hugh@blonde.site To: Jeremy Fitzhardinge cc: x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH tip] x86: unsigned long pte_pfn Message-ID: 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 pte_pfn() has always been of type unsigned long, even on 32-bit PAE; but in the current tip/next/mm tree it's unsigned long long on 64-bit, which gives an irritating warning if you try to printk a pfn with the usual %lx. Copy the inline function used by 32-bit's pgtable-3level.h. Signed-off-by: Hugh Dickins --- include/asm-x86/pgtable_64.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- 2.6.27-rc5-mm1/include/asm-x86/pgtable_64.h 2008-09-05 10:08:04.000000000 +0100 +++ linux/include/asm-x86/pgtable_64.h 2008-09-08 19:12:39.000000000 +0100 @@ -182,7 +182,11 @@ static inline int pmd_bad(pmd_t pmd) #define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT)) /* FIXME: is this right? */ #define pte_page(x) pfn_to_page(pte_pfn((x))) -#define pte_pfn(x) ((pte_val((x)) & __PHYSICAL_MASK) >> PAGE_SHIFT) + +static inline unsigned long pte_pfn(pte_t pte) +{ + return (pte_val(pte) & PTE_PFN_MASK) >> PAGE_SHIFT; +} /* * Macro to mark a page protection value as "uncacheable".