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 01/35] rename arm and frv's __pte_index()
Date: Fri, 01 May 2009 07:42:02 -0700 [thread overview]
Message-ID: <20090501144202.A869B8B0@kernel> (raw)
In-Reply-To: <20090501144201.D31EF417@kernel>
The arm and frv __pte_index()es are the exact same as everyone
else's pte_index(). So, remove the __ and give them the same
name as all the other implementations.
Signed-off-by: Dave Hansen <dave@linux.vnet.ibm.com>
---
linux-2.6.git-dave/arch/arm/include/asm/pgtable.h | 8 ++++----
linux-2.6.git-dave/arch/frv/include/asm/pgtable.h | 2 +-
linux-2.6.git-dave/arch/frv/kernel/gdb-stub.c | 2 +-
linux-2.6.git-dave/arch/frv/mm/fault.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff -puN arch/arm/include/asm/pgtable.h~rename-arm-__pte_index arch/arm/include/asm/pgtable.h
--- linux-2.6.git/arch/arm/include/asm/pgtable.h~rename-arm-__pte_index 2009-04-30 15:10:53.000000000 -0700
+++ linux-2.6.git-dave/arch/arm/include/asm/pgtable.h 2009-04-30 15:10:53.000000000 -0700
@@ -263,9 +263,9 @@ extern struct page *empty_zero_page;
#define pte_none(pte) (!pte_val(pte))
#define pte_clear(mm,addr,ptep) set_pte_ext(ptep, __pte(0), 0)
#define pte_page(pte) (pfn_to_page(pte_pfn(pte)))
-#define pte_offset_kernel(dir,addr) (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-#define pte_offset_map(dir,addr) (pmd_page_vaddr(*(dir)) + __pte_index(addr))
-#define pte_offset_map_nested(dir,addr) (pmd_page_vaddr(*(dir)) + __pte_index(addr))
+#define pte_offset_kernel(dir,addr) (pmd_page_vaddr(*(dir)) + pte_index(addr))
+#define pte_offset_map(dir,addr) (pmd_page_vaddr(*(dir)) + pte_index(addr))
+#define pte_offset_map_nested(dir,addr) (pmd_page_vaddr(*(dir)) + pte_index(addr))
#define pte_unmap(pte) do { } while (0)
#define pte_unmap_nested(pte) do { } while (0)
@@ -373,7 +373,7 @@ static inline pte_t *pmd_page_vaddr(pmd_
#define pmd_offset(dir, addr) ((pmd_t *)(dir))
/* Find an entry in the third-level page table.. */
-#define __pte_index(addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+#define pte_index(addr) (((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
{
diff -puN arch/frv/include/asm/pgtable.h~rename-arm-__pte_index arch/frv/include/asm/pgtable.h
--- linux-2.6.git/arch/frv/include/asm/pgtable.h~rename-arm-__pte_index 2009-04-30 15:10:53.000000000 -0700
+++ linux-2.6.git-dave/arch/frv/include/asm/pgtable.h 2009-04-30 15:10:53.000000000 -0700
@@ -436,7 +436,7 @@ static inline pte_t pte_modify(pte_t pte
#define pgd_index_k(addr) pgd_index(addr)
/* Find an entry in the bottom-level page table.. */
-#define __pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+#define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
/*
* the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE]
diff -puN arch/frv/kernel/gdb-stub.c~rename-arm-__pte_index arch/frv/kernel/gdb-stub.c
--- linux-2.6.git/arch/frv/kernel/gdb-stub.c~rename-arm-__pte_index 2009-04-30 15:10:53.000000000 -0700
+++ linux-2.6.git-dave/arch/frv/kernel/gdb-stub.c 2009-04-30 15:10:53.000000000 -0700
@@ -465,7 +465,7 @@ static inline unsigned long gdbstub_virt
__set_DAMPR(5, val | xAMPRx_L | xAMPRx_SS_16Kb | xAMPRx_S | xAMPRx_C | xAMPRx_V);
/* now its safe to access pmd */
- pte = (pte_t *)__get_DAMLR(5) + __pte_index(vaddr);
+ pte = (pte_t *)__get_DAMLR(5) + pte_index(vaddr);
if (pte_present(*pte))
val = pte_val(*pte);
else
diff -puN arch/frv/mm/fault.c~rename-arm-__pte_index arch/frv/mm/fault.c
--- linux-2.6.git/arch/frv/mm/fault.c~rename-arm-__pte_index 2009-04-30 15:10:53.000000000 -0700
+++ linux-2.6.git-dave/arch/frv/mm/fault.c 2009-04-30 15:10:53.000000000 -0700
@@ -240,7 +240,7 @@ asmlinkage void do_page_fault(int datamm
: "r" (_pme | xAMPRx_L|xAMPRx_SS_16Kb|xAMPRx_S|xAMPRx_C|xAMPRx_V)
);
- pte = (pte_t *) damlr + __pte_index(ear0);
+ pte = (pte_t *) damlr + pte_index(ear0);
val = pte_val(*pte);
asm volatile("movgs %0,dampr2" :: "r" (dampr));
_
next prev 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 ` Dave Hansen [this message]
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 ` [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=20090501144202.A869B8B0@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