From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764436AbZEAOsp (ORCPT ); Fri, 1 May 2009 10:48:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760319AbZEAOmd (ORCPT ); Fri, 1 May 2009 10:42:33 -0400 Received: from e39.co.us.ibm.com ([32.97.110.160]:50061 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759870AbZEAOma (ORCPT ); Fri, 1 May 2009 10:42:30 -0400 Subject: [RFC][PATCH 17/35] sparc: create ptemap.h To: linux-arch@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dave Hansen From: Dave Hansen Date: Fri, 01 May 2009 07:42:27 -0700 References: <20090501144201.D31EF417@kernel> In-Reply-To: <20090501144201.D31EF417@kernel> Message-Id: <20090501144227.3FFE505C@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/sparc/include/asm/pgtable_32.h | 15 -------- linux-2.6.git-dave/arch/sparc/include/asm/pgtable_64.h | 5 -- linux-2.6.git-dave/arch/sparc/include/asm/ptemap.h | 29 +++++++++++++++++ 3 files changed, 31 insertions(+), 18 deletions(-) diff -puN arch/sparc/include/asm/pgtable_32.h~sparc-ptemaph arch/sparc/include/asm/pgtable_32.h --- linux-2.6.git/arch/sparc/include/asm/pgtable_32.h~sparc-ptemaph 2009-04-30 15:11:02.000000000 -0700 +++ linux-2.6.git-dave/arch/sparc/include/asm/pgtable_32.h 2009-04-30 15:11:02.000000000 -0700 @@ -300,20 +300,7 @@ BTFIXUPDEF_CALL(pmd_t *, pmd_offset, pgd BTFIXUPDEF_CALL(pte_t *, pte_offset_kernel, pmd_t *, unsigned long) #define pte_offset_kernel(dir,addr) BTFIXUP_CALL(pte_offset_kernel)(dir,addr) -/* - * This shortcut works on sun4m (and sun4d) because the nocache area is static, - * and sun4c is guaranteed to have no highmem anyway. - */ -#define pte_offset_map(d, a) pte_offset_kernel(d,a) -#define pte_offset_map_nested(d, a) pte_offset_kernel(d,a) - -#define pte_unmap(pte) do{}while(0) -#define pte_unmap_nested(pte) do{}while(0) - -/* Certain architectures need to do special things when pte's - * within a page table are directly modified. Thus, the following - * hook is made available. - */ +#include BTFIXUPDEF_CALL(void, set_pte, pte_t *, pte_t) diff -puN arch/sparc/include/asm/pgtable_64.h~sparc-ptemaph arch/sparc/include/asm/pgtable_64.h --- linux-2.6.git/arch/sparc/include/asm/pgtable_64.h~sparc-ptemaph 2009-04-30 15:11:02.000000000 -0700 +++ linux-2.6.git-dave/arch/sparc/include/asm/pgtable_64.h 2009-04-30 15:11:02.000000000 -0700 @@ -652,10 +652,7 @@ static inline int pte_special(pte_t pte) /* Find an entry in the third-level page table.. */ #define pte_offset_kernel(dir, address) \ ((pte_t *)pmd_page_vaddr(*(dir)) + pte_index(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) +#include /* Actual page table PTE updates. */ extern void tlb_batch_add(struct mm_struct *mm, unsigned long vaddr, pte_t *ptep, pte_t orig); diff -puN /dev/null arch/sparc/include/asm/ptemap.h --- /dev/null 2008-09-02 09:40:19.000000000 -0700 +++ linux-2.6.git-dave/arch/sparc/include/asm/ptemap.h 2009-04-30 15:11:02.000000000 -0700 @@ -0,0 +1,29 @@ +#ifndef _SPARC_ASM_PTEMAP_H +#define _SPARC_ASM_PTEMAP_H + +#if defined(__sparc__) && defined(__arch64__) + +/* Certain architectures need to do special things when pte's + * within a page table are directly modified. Thus, the following + * hook is made available. + */ + +#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) + +#else + + * This shortcut works on sun4m (and sun4d) because the nocache area is static, + * and sun4c is guaranteed to have no highmem anyway. + */ +#define pte_offset_map(d, a) pte_offset_kernel(d,a) +#define pte_offset_map_nested(d, a) pte_offset_kernel(d,a) + +#define pte_unmap(pte) do{}while(0) +#define pte_unmap_nested(pte) do{}while(0) + +#endif + +#endif /* _SPARC_ASM_PTEMAP_H *//* _