linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 16/35] sh: create ptemap.h
Date: Fri, 01 May 2009 07:42:26 -0700	[thread overview]
Message-ID: <20090501144226.36C5E44D@kernel> (raw)
In-Reply-To: <20090501144201.D31EF417@kernel>



Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
---

 linux-2.6.git-dave/arch/sh/include/asm/pgtable_32.h |    6 +-----
 linux-2.6.git-dave/arch/sh/include/asm/pgtable_64.h |    5 +----
 linux-2.6.git-dave/arch/sh/include/asm/ptemap.h     |    9 +++++++++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff -puN arch/sh/include/asm/pgtable_32.h~sh-ptemaph arch/sh/include/asm/pgtable_32.h
--- linux-2.6.git/arch/sh/include/asm/pgtable_32.h~sh-ptemaph	2009-04-30 15:11:01.000000000 -0700
+++ linux-2.6.git-dave/arch/sh/include/asm/pgtable_32.h	2009-04-30 15:11:01.000000000 -0700
@@ -403,11 +403,7 @@ static inline pte_t pte_modify(pte_t pte
 #define pte_index(address)	((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #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>
 
 #ifdef CONFIG_X2TLB
 #define pte_ERROR(e) \
diff -puN arch/sh/include/asm/pgtable_64.h~sh-ptemaph arch/sh/include/asm/pgtable_64.h
--- linux-2.6.git/arch/sh/include/asm/pgtable_64.h~sh-ptemaph	2009-04-30 15:11:01.000000000 -0700
+++ linux-2.6.git-dave/arch/sh/include/asm/pgtable_64.h	2009-04-30 15:11:01.000000000 -0700
@@ -83,10 +83,7 @@ static __inline__ void pmd_set(pmd_t *pm
 #define pte_offset_kernel(dir, addr) \
 		((pte_t *) ((pmd_val(*(dir))) & PAGE_MASK) + pte_index((addr)))
 
-#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)
+#include <asm/ptemap.h>
 
 #ifndef __ASSEMBLY__
 #define IOBASE_VADDR	0xff000000
diff -puN /dev/null arch/sh/include/asm/ptemap.h
--- /dev/null	2008-09-02 09:40:19.000000000 -0700
+++ linux-2.6.git-dave/arch/sh/include/asm/ptemap.h	2009-04-30 15:11:01.000000000 -0700
@@ -0,0 +1,9 @@
+#ifndef _SH_ASM_PTEMAP_H
+#define _SH_ASM_PTEMAP_H
+
+#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)
+
+#endif /* _SH_ASM_PTEMAP_H */
_

  parent reply	other threads:[~2009-05-01 14:42 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 ` Dave Hansen [this message]
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 ` [RFC][PATCH 34/35] powerpc use generic ptemap.h Dave Hansen
2009-05-01 17:46   ` 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=20090501144226.36C5E44D@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;
as well as URLs for NNTP newsgroup(s).