From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Hansen Subject: [RFC][PATCH 06/35] cris: create ptemap.h Date: Fri, 01 May 2009 07:42:10 -0700 Message-ID: <20090501144210.82088247@kernel> References: <20090501144201.D31EF417@kernel> Return-path: Received: from e32.co.us.ibm.com ([32.97.110.150]:36757 "EHLO e32.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757008AbZEAOmM (ORCPT ); Fri, 1 May 2009 10:42:12 -0400 In-Reply-To: <20090501144201.D31EF417@kernel> Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dave Hansen Signed-off-by: Dave Hansen --- linux-2.6.git-dave/arch/cris/include/asm/pgtable.h | 7 +------ linux-2.6.git-dave/arch/cris/include/asm/ptemap.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff -puN arch/cris/include/asm/pgtable.h~cris-ptemaph arch/cris/include/asm/pgtable.h --- linux-2.6.git/arch/cris/include/asm/pgtable.h~cris-ptemaph 2009-04-30 15:10:56.000000000 -0700 +++ linux-2.6.git-dave/arch/cris/include/asm/pgtable.h 2009-04-30 15:10:56.000000000 -0700 @@ -244,12 +244,7 @@ static inline pgd_t * pgd_offset(const s (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) #define pte_offset_kernel(dir, address) \ ((pte_t *) pmd_page_vaddr(*(dir)) + __pte_offset(address)) -#define pte_offset_map(dir, address) \ - ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(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) +#include #define pte_pfn(x) ((unsigned long)(__va((x).pte)) >> PAGE_SHIFT) #define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) diff -puN arch/cris/include/asm/ptemap.h~cris-ptemaph arch/cris/include/asm/ptemap.h --- linux-2.6.git/arch/cris/include/asm/ptemap.h~cris-ptemaph 2009-04-30 15:10:56.000000000 -0700 +++ linux-2.6.git-dave/arch/cris/include/asm/ptemap.h 2009-04-30 15:10:56.000000000 -0700 @@ -0,0 +1,11 @@ +#ifndef _CRIS_ASM_PTEMAP_H +#define _CRIS_ASM_PTEMAP_H + +#define pte_offset_map(dir, address) \ + ((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(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 /* _CRIS_ASM_PTEMAP_H */ _