Commit 251a0ffe authored by Arjun Roy's avatar Arjun Roy Committed by Linus Torvalds
Browse files

mm: bring sparc pte_index() semantics inline with other platforms

pte_index() on platforms other than sparc return a numerical index.  On
sparc, it returns a pte_t*.  This presents an issue for
vm_insert_pages(), which relies on pte_index() to find the offset for a
pte within a pmd, for batched inserts.

This patch:
1. Modifies pte_index() for sparc to return a numerical index, like
   other platforms,
2. Defines pte_entry() for sparc which returns a pte_t*
   (as pte_index() used to),
3. Converts existing sparc callers for pte_index() to use pte_entry().

[ remove pte_entry and just directly modified pte_offset_kernel instead]
Signed-off-by: default avatarArjun Roy <>
Signed-off-by: default avatarStephen Rothwell <>
Signed-off-by: default avatarAndrew Morton <>
Reviewed-by: default avatarMike Rapoport <>
Cc: Eric Dumazet <>
Cc: Soheil Hassas Yeganeh <>
Cc: David Miller <>
Cc: Matthew Wilcox <>
Cc: Arjun Roy <>
Cc: Jason Gunthorpe <>

Signed-off-by: default avatarLinus Torvalds <>
parent 8efd6f5b
......@@ -907,11 +907,11 @@ static inline unsigned long pud_pfn(pud_t pud)
(((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)))
/* Find an entry in the third-level page table.. */
#define pte_index(dir, address) \
((pte_t *) __pmd_page(*(dir)) + \
((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)))
#define pte_offset_kernel pte_index
#define pte_offset_map pte_index
#define pte_index(address) \
((address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))
#define pte_offset_kernel(dir, address) \
((pte_t *) __pmd_page(*(dir)) + pte_index(address))
#define pte_offset_map(dir, address) pte_offset_kernel((dir), (address))
#define pte_unmap(pte) do { } while (0)
/* We cannot include <linux/mm_types.h> at this point yet: */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment