[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] remove __pte_offset

To: Benjamin LaHaise <bcrl@redhat.com>
Subject: Re: [PATCH] remove __pte_offset
From: Dave Hansen <haveblue@us.ibm.com>
Date: Tue, 04 Mar 2003 15:16:16 -0800
CC: Andrew Morton <akpm@digeo.com>, linux-mm@kvack.org
Fake-Sender: owner-linux-mm@kvack.org
Original-Recipient: rfc822;linux-mm-archive@humbolt.geo.uu.nl
References: <3E653012.5040503@us.ibm.com> <3E6530B3.2000906@us.ibm.com> <20030304181002.A16110@redhat.com>
Sender: Rik van Riel <riel@nl.linux.org>
User-Agent: Mozilla/5.0 (compatible; MSIE5.5; Windows 98;

Benjamin LaHaise wrote:
> On Tue, Mar 04, 2003 at 03:03:15PM -0800, Dave Hansen wrote:
> 
>>ptes this time
> > Isn't pte_to_pfn a better name?  index doesn't have a type of data 
> implied, whereas pfn does.  We have to make these distinctions clearer 
> as work like William's PAGE_SIZE is being done.

Works for me.  Here's an updated patch.

-- 
Dave Hansen
haveblue@us.ibm.com

diff -ru linux-2.5.63-pmdindex/include/asm-i386/pgtable.h linux-2.5.63-pteindex/include/asm-i386/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-i386/pgtable.h	Tue Mar  4 14:39:45 2003
+++ linux-2.5.63-pteindex/include/asm-i386/pgtable.h	Tue Mar  4 14:45:22 2003
@@ -245,21 +245,21 @@
 		(((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1))
 
 /* Find an entry in the third-level page table.. */
-#define __pte_offset(address) \
+#define pte_to_pfn(address) \
 		(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
-	((pte_t *) pmd_page_kernel(*(dir)) +  __pte_offset(address))
+	((pte_t *) pmd_page_kernel(*(dir)) +  pte_to_pfn(address))
 
 #if defined(CONFIG_HIGHPTE)
 #define pte_offset_map(dir, address) \
-	((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + __pte_offset(address))
+	((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_to_pfn(address))
 #define pte_offset_map_nested(dir, address) \
-	((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + __pte_offset(address))
+	((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_to_pfn(address))
 #define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)
 #define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1)
 #else
 #define pte_offset_map(dir, address) \
-	((pte_t *)page_address(pmd_page(*(dir))) + __pte_offset(address))
+	((pte_t *)page_address(pmd_page(*(dir))) + pte_to_pfn(address))
 #define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)
 #define pte_unmap(pte) do { } while (0)
 #define pte_unmap_nested(pte) do { } while (0)
diff -ru linux-2.5.63-pmdindex/include/asm-ia64/pgtable.h linux-2.5.63-pteindex/include/asm-ia64/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-ia64/pgtable.h	Tue Mar  4 14:36:40 2003
+++ linux-2.5.63-pteindex/include/asm-ia64/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -317,8 +317,8 @@
  * Find an entry in the third-level page table.  This looks more complicated than it
  * should be because some platforms place page tables in high memory.
  */
-#define __pte_offset(addr)	 	(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
-#define pte_offset_kernel(dir,addr)	((pte_t *) pmd_page_kernel(*(dir)) + __pte_offset(addr))
+#define pte_to_pfn(addr)	 	(((addr) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+#define pte_offset_kernel(dir,addr)	((pte_t *) pmd_page_kernel(*(dir)) + pte_to_pfn(addr))
 #define pte_offset_map(dir,addr)	pte_offset_kernel(dir, addr)
 #define pte_offset_map_nested(dir,addr)	pte_offset_map(dir, addr)
 #define pte_unmap(pte)			do { } while (0)
diff -ru linux-2.5.63-pmdindex/include/asm-m68k/sun3_pgtable.h linux-2.5.63-pteindex/include/asm-m68k/sun3_pgtable.h
--- linux-2.5.63-pmdindex/include/asm-m68k/sun3_pgtable.h	Tue Mar  4 14:36:40 2003
+++ linux-2.5.63-pteindex/include/asm-m68k/sun3_pgtable.h	Tue Mar  4 14:44:49 2003
@@ -196,10 +196,10 @@
 }
 
 /* Find an entry in the third-level pagetable. */
-#define __pte_offset(address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
-#define pte_offset_kernel(pmd, address) ((pte_t *) __pmd_page(*pmd) + __pte_offset(address))
+#define pte_to_pfn(address) ((address >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
+#define pte_offset_kernel(pmd, address) ((pte_t *) __pmd_page(*pmd) + pte_to_pfn(address))
 /* FIXME: should we bother with kmap() here? */
-#define pte_offset_map(pmd, address) ((pte_t *)kmap(pmd_page(*pmd)) + __pte_offset(address))
+#define pte_offset_map(pmd, address) ((pte_t *)kmap(pmd_page(*pmd)) + pte_to_pfn(address))
 #define pte_offset_map_nested(pmd, address) pte_offset_map(pmd, address)
 #define pte_unmap(pte) kunmap(pte)
 #define pte_unmap_nested(pte) kunmap(pte)
diff -ru linux-2.5.63-pmdindex/include/asm-parisc/pgtable.h linux-2.5.63-pteindex/include/asm-parisc/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-parisc/pgtable.h	Tue Mar  4 14:36:40 2003
+++ linux-2.5.63-pteindex/include/asm-parisc/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -329,9 +329,9 @@
 #endif
 
 /* Find an entry in the third-level page table.. */ 
-#define __pte_offset(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
+#define pte_to_pfn(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
 #define pte_offset_kernel(pmd, address) \
-	((pte_t *) pmd_page_kernel(*(pmd)) + __pte_offset(address))
+	((pte_t *) pmd_page_kernel(*(pmd)) + pte_to_pfn(address))
 #define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_unmap(pte) do { } while (0)
diff -ru linux-2.5.63-pmdindex/include/asm-ppc/pgtable.h linux-2.5.63-pteindex/include/asm-ppc/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-ppc/pgtable.h	Tue Mar  4 14:36:40 2003
+++ linux-2.5.63-pteindex/include/asm-ppc/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -494,14 +494,14 @@
 }
 
 /* Find an entry in the third-level page table.. */
-#define __pte_offset(address)		\
+#define pte_to_pfn(address)		\
 	(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, addr)	\
-	((pte_t *) pmd_page_kernel(*(dir)) + __pte_offset(addr))
+	((pte_t *) pmd_page_kernel(*(dir)) + pte_to_pfn(addr))
 #define pte_offset_map(dir, addr)		\
-	((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE0) + __pte_offset(addr))
+	((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE0) + pte_to_pfn(addr))
 #define pte_offset_map_nested(dir, addr)	\
-	((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE1) + __pte_offset(addr))
+	((pte_t *) kmap_atomic(pmd_page(*(dir)), KM_PTE1) + pte_to_pfn(addr))
 
 #define pte_unmap(pte)		kunmap_atomic(pte, KM_PTE0)
 #define pte_unmap_nested(pte)	kunmap_atomic(pte, KM_PTE1)
diff -ru linux-2.5.63-pmdindex/include/asm-s390/pgtable.h linux-2.5.63-pteindex/include/asm-s390/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-s390/pgtable.h	Tue Mar  4 14:36:41 2003
+++ linux-2.5.63-pteindex/include/asm-s390/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -467,9 +467,9 @@
 }
 
 /* Find an entry in the third-level page table.. */
-#define __pte_offset(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
+#define pte_to_pfn(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
 #define pte_offset_kernel(pmd, address) \
-	((pte_t *) pmd_page_kernel(*(pmd)) + __pte_offset(address))
+	((pte_t *) pmd_page_kernel(*(pmd)) + pte_to_pfn(address))
 #define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_unmap(pte) do { } while (0)
diff -ru linux-2.5.63-pmdindex/include/asm-s390x/pgtable.h linux-2.5.63-pteindex/include/asm-s390x/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-s390x/pgtable.h	Tue Mar  4 14:41:35 2003
+++ linux-2.5.63-pteindex/include/asm-s390x/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -493,9 +493,9 @@
 	((pmd_t *) pgd_page_kernel(*(dir)) + pmd_index(addr))
 
 /* Find an entry in the third-level page table.. */
-#define __pte_offset(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
+#define pte_to_pfn(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE-1))
 #define pte_offset_kernel(pmd, address) \
-	((pte_t *) pmd_page_kernel(*(pmd)) + __pte_offset(address))
+	((pte_t *) pmd_page_kernel(*(pmd)) + pte_to_pfn(address))
 #define pte_offset_map(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_offset_map_nested(pmd, address) pte_offset_kernel(pmd, address)
 #define pte_unmap(pte) do { } while (0)
diff -ru linux-2.5.63-pmdindex/include/asm-sh/pgtable.h linux-2.5.63-pteindex/include/asm-sh/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-sh/pgtable.h	Tue Mar  4 14:36:41 2003
+++ linux-2.5.63-pteindex/include/asm-sh/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -280,10 +280,10 @@
 #define pgd_offset_k(address) pgd_offset(&init_mm, address)
 
 /* Find an entry in the third-level page table.. */
-#define __pte_offset(address) \
+#define pte_to_pfn(address) \
 		((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset(dir, address) ((pte_t *) pmd_page(*(dir)) + \
-			__pte_offset(address))
+			pte_to_pfn(address))
 
 extern void update_mmu_cache(struct vm_area_struct * vma,
 			     unsigned long address, pte_t pte);
diff -ru linux-2.5.63-pmdindex/include/asm-sparc64/pgtable.h linux-2.5.63-pteindex/include/asm-sparc64/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-sparc64/pgtable.h	Tue Mar  4 14:36:41 2003
+++ linux-2.5.63-pteindex/include/asm-sparc64/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -273,11 +273,11 @@
 					((address >> PMD_SHIFT) & (REAL_PTRS_PER_PMD-1)))
 
 /* Find an entry in the third-level page table.. */
-#define __pte_offset(dir, address)	((pte_t *) __pmd_page(*(dir)) + \
+#define pte_to_pfn(dir, address)	((pte_t *) __pmd_page(*(dir)) + \
 					((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)))
-#define pte_offset_kernel		__pte_offset
-#define pte_offset_map			__pte_offset
-#define pte_offset_map_nested		__pte_offset
+#define pte_offset_kernel		pte_to_pfn
+#define pte_offset_map			pte_to_pfn
+#define pte_offset_map_nested		pte_to_pfn
 #define pte_unmap(pte)			do { } while (0)
 #define pte_unmap_nested(pte)		do { } while (0)
 
diff -ru linux-2.5.63-pmdindex/include/asm-um/pgtable.h linux-2.5.63-pteindex/include/asm-um/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-um/pgtable.h	Tue Mar  4 14:39:54 2003
+++ linux-2.5.63-pteindex/include/asm-um/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -375,13 +375,13 @@
 }
 
 /* Find an entry in the third-level page table.. */ 
-#define __pte_offset(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
+#define pte_to_pfn(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) \
-	((pte_t *) pmd_page_kernel(*(dir)) +  __pte_offset(address))
+	((pte_t *) pmd_page_kernel(*(dir)) +  pte_to_pfn(address))
 #define pte_offset_map(dir, address) \
-        ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + __pte_offset(address))
+        ((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE0) + pte_to_pfn(address))
 #define pte_offset_map_nested(dir, address) \
-	((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + __pte_offset(address))
+	((pte_t *)kmap_atomic(pmd_page(*(dir)),KM_PTE1) + pte_to_pfn(address))
 #define pte_unmap(pte) kunmap_atomic((pte), KM_PTE0)
 #define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)
 
diff -ru linux-2.5.63-pmdindex/include/asm-x86_64/pgtable.h linux-2.5.63-pteindex/include/asm-x86_64/pgtable.h
--- linux-2.5.63-pmdindex/include/asm-x86_64/pgtable.h	Tue Mar  4 14:41:38 2003
+++ linux-2.5.63-pteindex/include/asm-x86_64/pgtable.h	Tue Mar  4 14:44:49 2003
@@ -353,10 +353,10 @@
        return pte; 
 }
 
-#define __pte_offset(address) \
+#define pte_to_pfn(address) \
 		((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
 #define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_kernel(*(dir)) + \
-			__pte_offset(address))
+			pte_to_pfn(address))
 
 /* x86-64 always has all page tables mapped. */
 #define pte_offset_map(dir,address) pte_offset_kernel(dir,address)

References:
- [PATCH] remove __pgd_offset
  - From: Dave Hansen <haveblue@us.ibm.com>
- [PATCH] remove __pte_offset
  - From: Dave Hansen <haveblue@us.ibm.com>
- Re: [PATCH] remove __pte_offset
  - From: Benjamin LaHaise <bcrl@redhat.com>

Prev by Date: Re: [PATCH] remove __pte_offset
Next by Date: Re: [PATCH] remove __pte_offset
Prev by thread: Re: [PATCH] remove __pte_offset
Next by thread: Re: [PATCH] remove __pte_offset
Index(es):
- Date
- Thread