From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758371AbZETSbH (ORCPT ); Wed, 20 May 2009 14:31:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756747AbZETSZi (ORCPT ); Wed, 20 May 2009 14:25:38 -0400 Received: from e8.ny.us.ibm.com ([32.97.182.138]:59116 "EHLO e8.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756663AbZETSZ1 (ORCPT ); Wed, 20 May 2009 14:25:27 -0400 Subject: [RFC v2][PATCH 26/35] frv: use pte_offset_kernel() as base for pte_offset_map*() To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dave Hansen From: Dave Hansen Date: Wed, 20 May 2009 11:25:26 -0700 References: <20090520182445.D7B49A7C@kernel> In-Reply-To: <20090520182445.D7B49A7C@kernel> Message-Id: <20090520182526.48FB2B3E@kernel> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some architectures use pte_offset_map() as a basis for pte_offset_kernel(). Others do the inverse. Although arbitrary, Using pte_offset_kernel() as the base seems a wee bit more popular and it also fits in well with the way I'm breaking out the headers. Instead of coding the same implementation twice, this makes pte_offset_map{,_nested}() call pte_offset_kernel() directly. Signed-off-by: Dave Hansen --- linux-2.6.git-dave/arch/frv/include/asm/highmem.h | 5 +++++ linux-2.6.git-dave/arch/frv/include/asm/ptemap.h | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff -puN arch/frv/include/asm/highmem.h~frv-pte_offset_kernel arch/frv/include/asm/highmem.h --- linux-2.6.git/arch/frv/include/asm/highmem.h~frv-pte_offset_kernel 2009-04-30 15:11:08.000000000 -0700 +++ linux-2.6.git-dave/arch/frv/include/asm/highmem.h 2009-04-30 15:11:08.000000000 -0700 @@ -42,6 +42,11 @@ extern unsigned long highstart_pfn, high #define kmap_prot PAGE_KERNEL #define kmap_pte ______kmap_pte_in_TLB +/* + * This lets us share the highpte pte_offset_map() + * with x86 + */ +#define kmap_atomic_pte(page, type) kmap_atomic(page, type) extern pte_t *pkmap_page_table; #define flush_cache_kmaps() do { } while (0) diff -puN arch/frv/include/asm/ptemap.h~frv-pte_offset_kernel arch/frv/include/asm/ptemap.h --- linux-2.6.git/arch/frv/include/asm/ptemap.h~frv-pte_offset_kernel 2009-04-30 15:11:08.000000000 -0700 +++ linux-2.6.git-dave/arch/frv/include/asm/ptemap.h 2009-04-30 15:11:08.000000000 -0700 @@ -9,9 +9,8 @@ #define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0) #define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1) #else -#define pte_offset_map(dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address)) -#define pte_offset_map_nested(dir, address) pte_offset_map((dir), (address)) +#define pte_offset_map(dir, address) pte_offset_kernel(dir, address) +#define pte_offset_map_nested(dir, address) pte_offset_kernel(dir, address) #define pte_unmap(pte) do { } while (0) #define pte_unmap_nested(pte) do { } while (0) #endif _