From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757228AbZETS0t (ORCPT ); Wed, 20 May 2009 14:26:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755953AbZETSY6 (ORCPT ); Wed, 20 May 2009 14:24:58 -0400 Received: from e1.ny.us.ibm.com ([32.97.182.141]:34951 "EHLO e1.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756273AbZETSY5 (ORCPT ); Wed, 20 May 2009 14:24:57 -0400 Subject: [RFC v2][PATCH 07/35] frv: create ptemap.h To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dave Hansen From: Dave Hansen Date: Wed, 20 May 2009 11:24:56 -0700 References: <20090520182445.D7B49A7C@kernel> In-Reply-To: <20090520182445.D7B49A7C@kernel> Message-Id: <20090520182456.A7C77A5F@kernel> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Dave Hansen --- linux-2.6.git-dave/arch/frv/include/asm/pgtable.h | 15 +-------------- linux-2.6.git-dave/arch/frv/include/asm/ptemap.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 14 deletions(-) diff -puN arch/frv/include/asm/pgtable.h~frv-ptemaph arch/frv/include/asm/pgtable.h --- linux-2.6.git/arch/frv/include/asm/pgtable.h~frv-ptemaph 2009-04-30 15:10:56.000000000 -0700 +++ linux-2.6.git-dave/arch/frv/include/asm/pgtable.h 2009-04-30 15:10:56.000000000 -0700 @@ -449,20 +449,7 @@ static inline pte_t pte_modify(pte_t pte #define pte_offset_kernel(dir, address) \ ((pte_t *) pmd_page_vaddr(*(dir)) + pte_index(address)) -#if defined(CONFIG_HIGHPTE) -#define pte_offset_map(dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address)) -#define pte_offset_map_nested(dir, address) \ - ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_index(address)) -#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_unmap(pte) do { } while (0) -#define pte_unmap_nested(pte) do { } while (0) -#endif +#include /* * Handle swap and file entries diff -puN arch/frv/include/asm/ptemap.h~frv-ptemaph arch/frv/include/asm/ptemap.h --- linux-2.6.git/arch/frv/include/asm/ptemap.h~frv-ptemaph 2009-04-30 15:10:56.000000000 -0700 +++ linux-2.6.git-dave/arch/frv/include/asm/ptemap.h 2009-04-30 15:10:56.000000000 -0700 @@ -0,0 +1,19 @@ +#ifndef _FRV_ASM_PTEMAP_H +#define _FRV_ASM_PTEMAP_H + +#if defined(CONFIG_HIGHPTE) +#define pte_offset_map(dir, address) \ + ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_index(address)) +#define pte_offset_map_nested(dir, address) \ + ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_index(address)) +#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_unmap(pte) do { } while (0) +#define pte_unmap_nested(pte) do { } while (0) +#endif + +#endif /* _FRV_ASM_PTEMAP_H */ _