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 33/35] asm-generic/ptemap.h for HIGHPTE implementations
Date: Wed, 20 May 2009 11:25:37 -0700 [thread overview]
Message-ID: <20090520182537.AB63BEB5@kernel> (raw)
In-Reply-To: <20090520182445.D7B49A7C@kernel>
x86 and frv have identical CONFIG_HIGHPTE implementations
of the pte mapping functions. Consolidate and move these
to asm-generic/ptemap.h.
Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
---
linux-2.6.git-dave/arch/frv/include/asm/ptemap.h | 14 --------------
linux-2.6.git-dave/arch/x86/include/asm/ptemap.h | 19 -------------------
linux-2.6.git-dave/include/asm-generic/ptemap.h | 20 ++++++++++++++++++++
linux-2.6.git-dave/orphan.dir/ptemap-overview.txt | 12 ++++++++++++
4 files changed, 32 insertions(+), 33 deletions(-)
diff -puN arch/frv/include/asm/ptemap.h~asm-generic-ptemap-h-highpte arch/frv/include/asm/ptemap.h
--- linux-2.6.git/arch/frv/include/asm/ptemap.h~asm-generic-ptemap-h-highpte 2009-05-20 10:58:55.000000000 -0700
+++ linux-2.6.git-dave/arch/frv/include/asm/ptemap.h 2009-05-20 10:58:55.000000000 -0700
@@ -1,15 +1 @@
-#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
#include <asm-generic/ptemap.h>
-#endif
-
-#endif /* _FRV_ASM_PTEMAP_H */
diff -puN arch/x86/include/asm/ptemap.h~asm-generic-ptemap-h-highpte arch/x86/include/asm/ptemap.h
--- linux-2.6.git/arch/x86/include/asm/ptemap.h~asm-generic-ptemap-h-highpte 2009-05-20 10:58:55.000000000 -0700
+++ linux-2.6.git-dave/arch/x86/include/asm/ptemap.h 2009-05-20 10:58:55.000000000 -0700
@@ -1,20 +1 @@
-#ifndef _X86_ASM_PTEMAP_H
-#define _X86_ASM_PTEMAP_H
-
-#if defined(CONFIG_HIGHPTE)
-#define pte_offset_map(dir, address) \
- ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) + \
- pte_index((address)))
-#define pte_offset_map_nested(dir, address) \
- ((pte_t *)kmap_atomic_pte(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 /* !CONFIG_HIGHPTE */
-
#include <asm-generic/ptemap.h>
-
-#endif
-
-#endif /* _X86_ASM_PTEMAP_H */
diff -puN include/asm-generic/ptemap.h~asm-generic-ptemap-h-highpte include/asm-generic/ptemap.h
--- linux-2.6.git/include/asm-generic/ptemap.h~asm-generic-ptemap-h-highpte 2009-05-20 10:58:55.000000000 -0700
+++ linux-2.6.git-dave/include/asm-generic/ptemap.h 2009-05-20 10:59:13.000000000 -0700
@@ -5,11 +5,31 @@
* If your architecture has direct-mapped pte pages (no HIGHPTE)
* then you just need to implement pte_offset_kernel() and include
* this in your asm/ptemap.h.
+ *
+ * To support HIGHPTE, you need to have implementations of
+ * kmap_atomic_pte() (which usually just calls kmap_atomic()),
+ * pmd_page() and pmd_index().
*/
+#include <linux/mm.h>
+
+#ifdef CONFIG_HIGHPTE
+
+#include <asm/highmem.h>
+#define pte_offset_map(dir, address) \
+ ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)),KM_PTE0) + pte_index(address))
+#define pte_offset_map_nested(dir, address) \
+ ((pte_t *)kmap_atomic_pte(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 /* !CONFIG_HIGHPTE */
+
#define pte_offset_map(dir,addr) pte_offset_kernel((dir),(addr))
#define pte_offset_map_nested(dir,addr) pte_offset_kernel((dir),(addr))
#define pte_unmap(pte) do { } while (0)
#define pte_unmap_nested(pte) do { } while (0)
+#endif /* CONFIG_HIGHPTE */
+
#endif /* _ASM_GENERIC_PTEMAP_H */
diff -puN orphan.dir/ptemap-overview.txt~asm-generic-ptemap-h-highpte orphan.dir/ptemap-overview.txt
next prev parent reply other threads:[~2009-05-20 18:33 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 ` [RFC v2][PATCH 17/35] sparc: " Dave Hansen
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 ` Dave Hansen [this message]
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=20090520182537.AB63BEB5@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