From: Dave Hansen <dave@linux.vnet.ibm.com>
To: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Dave Hansen <dave@linux.vnet.ibm.com>
Subject: [RFC v2][PATCH 17/35] sparc: create ptemap.h
Date: Wed, 20 May 2009 11:25:12 -0700 [thread overview]
Message-ID: <20090520182512.B53B8D2E@kernel> (raw)
In-Reply-To: <20090520182445.D7B49A7C@kernel>
Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
---
linux-2.6.git-dave/arch/sparc/include/asm/pgtable_32.h | 10 -------
linux-2.6.git-dave/arch/sparc/include/asm/pgtable_64.h | 5 ---
linux-2.6.git-dave/arch/sparc/include/asm/ptemap.h | 24 +++++++++++++++++
3 files changed, 26 insertions(+), 13 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-05-02 14:39:54.000000000 -0700
+++ linux-2.6.git-dave/arch/sparc/include/asm/pgtable_32.h 2009-05-02 14:40:38.000000000 -0700
@@ -300,15 +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)
+#include <asm/ptemap.h>
/* Certain architectures need to do special things when pte's
* within a page table are directly modified. Thus, the following
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-05-02 14:39:54.000000000 -0700
+++ linux-2.6.git-dave/arch/sparc/include/asm/pgtable_64.h 2009-05-02 14:39:54.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 <asm/ptemap.h>
/* 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-05-02 14:41:35.000000000 -0700
@@ -0,0 +1,24 @@
+#ifndef _SPARC_ASM_PTEMAP_H
+#define _SPARC_ASM_PTEMAP_H
+
+#if defined(__sparc__) && defined(__arch64__)
+
+#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 */
_
next prev parent reply other threads:[~2009-05-20 18:28 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-20 18:24 [RFC v2][PATCH 00/35] consolidate pte mapping functions across all architectures Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 01/35] rename arm and frv's __pte_index() Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 02/35] rework sparc pte functions to be consistent with other arches Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 03/35] alpha: create ptemap.h Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 04/35] arm: " Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 05/35] avr32: " Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 06/35] cris: " Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 07/35] frv: " Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 08/35] ia64: " Dave Hansen
2009-05-20 18:24 ` [RFC v2][PATCH 09/35] m32r: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 10/35] m68k: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 11/35] mips: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 12/35] mn10300: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 13/35] parisc: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 14/35] powerpc: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 15/35] s390: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 16/35] sh: " Dave Hansen
2009-05-20 18:25 ` Dave Hansen [this message]
2009-05-20 18:25 ` [RFC v2][PATCH 18/35] um: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 19/35] x86: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 20/35] xtensa: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 21/35] create linux/ptemap.h for arch-independent pte mapping funcs Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 22/35] include linux/ptemap.h at all use sites Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 23/35] factor x86 pte mapping code Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 24/35] arm: use pte_offset_kernel() as base for pte_offset_map*() Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 25/35] cris: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 26/35] frv: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 27/35] m32r: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 28/35] mips: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 29/35] um: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 30/35] m68k: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 31/35] mn10300: " Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 32/35] Move users to asm-generic/ptemap.h Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 33/35] asm-generic/ptemap.h for HIGHPTE implementations Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 34/35] powerpc use generic ptemap.h Dave Hansen
2009-05-20 18:25 ` [RFC v2][PATCH 35/35] remove old ptemap.h includes Dave Hansen
2009-05-20 22:06 ` [RFC v2][PATCH 00/35] consolidate pte mapping functions across all architectures Jeremy Fitzhardinge
2009-05-20 22:38 ` Dave Hansen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090520182512.B53B8D2E@kernel \
--to=dave@linux.vnet.ibm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox