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][PATCH 34/35] powerpc use generic ptemap.h
Date: Fri, 01 May 2009 07:42:54 -0700 [thread overview]
Message-ID: <20090501144254.52127677@kernel> (raw)
In-Reply-To: <20090501144201.D31EF417@kernel>
powerpc is a bid of an oddball here. It seems to have CONFIG_HIGHPTE
behavior at all times when compiled as 32-bit. There's even an
#ifdef CONFIG_HIGHPTE in arch/powerpc/mm/pgtable_32.c, but there's no
trace of HIGHPTE in Kconfig anywhere.
This gives ppc32 an explicit HIGHPTE in Kconfig so that we can use
the #ifdef in asm-generic/ptemap.h and let ppc use the generic code
with x86 and frv.
Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
---
linux-2.6.git-dave/arch/powerpc/Kconfig | 4 ++++
linux-2.6.git-dave/arch/powerpc/include/asm/ptemap.h | 18 ++++++------------
2 files changed, 10 insertions(+), 12 deletions(-)
diff -puN arch/powerpc/include/asm/ptemap.h~powerpc-pte_offset_kernel arch/powerpc/include/asm/ptemap.h
--- linux-2.6.git/arch/powerpc/include/asm/ptemap.h~powerpc-pte_offset_kernel 2009-04-30 15:11:13.000000000 -0700
+++ linux-2.6.git-dave/arch/powerpc/include/asm/ptemap.h 2009-04-30 15:11:13.000000000 -0700
@@ -2,19 +2,13 @@
#define _POWERPC_ASM_PTEMAP_H
#ifndef __powerpc64__
-
-#define pte_offset_map(dir, addr) \
- ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE0) + pte_index(addr))
-#define pte_offset_map_nested(dir, addr) \
- ((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE1) + pte_index(addr))
-
-#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)
-#define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1)
-
-#else /* __powerpc64__ */
+/*
+ * This lets us use the x86 implementation
+ * in the generic ptemap.h
+ */
+#define kmap_atomic_pte(page, type) kmap_atomic(page, type)
+#endif
#include <asm-generic/ptemap.h>
-#endif
-
#endif /* _POWERPC_ASM_PTEMAP_H */
diff -puN arch/powerpc/Kconfig~powerpc-pte_offset_kernel arch/powerpc/Kconfig
--- linux-2.6.git/arch/powerpc/Kconfig~powerpc-pte_offset_kernel 2009-04-30 15:11:13.000000000 -0700
+++ linux-2.6.git-dave/arch/powerpc/Kconfig 2009-04-30 15:11:13.000000000 -0700
@@ -244,6 +244,10 @@ config HIGHMEM
bool "High memory support"
depends on PPC32
+config HIGHPTE
+ def_bool y
+ depends on HIGHMEM
+
source kernel/time/Kconfig
source kernel/Kconfig.hz
source kernel/Kconfig.preempt
_
next prev parent reply other threads:[~2009-05-01 14:55 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-01 14:42 [RFC][PATCH 00/35] consolidate pte mapping functions across all architectures Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 01/35] rename arm and frv's __pte_index() Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 02/35] rework sparc pte functions to be consistent with other arches Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 03/35] alpha: create ptemap.h Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 04/35] arm: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 05/35] avr32: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 06/35] cris: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 07/35] frv: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 08/35] ia64: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 09/35] m32r: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 10/35] m68k: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 11/35] mips: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 12/35] mn10300: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 13/35] parisc: " Dave Hansen
2009-05-02 14:29 ` Kyle McMartin
2009-05-02 21:45 ` Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 14/35] powerpc: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 15/35] s390: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 16/35] sh: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 17/35] sparc: " Dave Hansen
2009-05-02 7:02 ` Daniel K.
2009-05-02 21:42 ` Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 18/35] um: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 19/35] x86: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 20/35] xtensa: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 21/35] create linux/ptemap.h for arch-independent pte mapping funcs Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 22/35] include linux/ptemap.h at all use sites Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 23/35] factor x86 pte mapping code Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 24/35] arm: use pte_offset_kernel() as base for pte_offset_map*() Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 25/35] cris: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 26/35] frv: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 27/35] m32r: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 28/35] mips: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 29/35] um: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 30/35] m68k: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 31/35] mn10300: " Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 32/35] Move users to asm-generic/ptemap.h Dave Hansen
2009-05-01 17:43 ` Christoph Hellwig
2009-05-01 18:08 ` Dave Hansen
2009-05-01 14:42 ` [RFC][PATCH 33/35] asm-generic/ptemap.h for HIGHPTE users Dave Hansen
2009-05-01 17:51 ` Luck, Tony
2009-05-01 18:10 ` Dave Hansen
2009-05-01 18:29 ` Luck, Tony
2009-05-01 18:32 ` Dave Hansen
2009-05-01 14:42 ` Dave Hansen [this message]
2009-05-01 17:46 ` [RFC][PATCH 34/35] powerpc use generic ptemap.h Christoph Hellwig
2009-05-01 17:58 ` Dave Hansen
2009-05-17 3:55 ` Benjamin Herrenschmidt
2009-05-01 14:42 ` [RFC][PATCH 35/35] remove old ptemap.h includes Dave Hansen
2009-05-01 14:59 ` Ingo Molnar
2009-05-01 15:02 ` 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=20090501144254.52127677@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