Commit 8f6c99c1 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

[PATCH] freepgt: remove arch pgd_addr_end

ia64 and sparc64 hurriedly had to introduce their own variants of
pgd_addr_end, to leapfrog over the holes in their virtual address spaces which
the final clear_page_range suddenly presented when converted from pgd_index to
pgd_addr_end.  But now that free_pgtables respects the vma list, those holes
are never presented, and the arch variants can go.
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3bf5ee95
...@@ -140,17 +140,15 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres ...@@ -140,17 +140,15 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres
#endif #endif
/* /*
* When walking page tables, get the address of the next boundary, or * When walking page tables, get the address of the next boundary,
* the end address of the range if that comes earlier. Although end might * or the end address of the range if that comes earlier. Although no
* wrap to 0 only in clear_page_range, __boundary may wrap to 0 throughout. * vma end wraps to 0, rounded up __boundary may wrap to 0 throughout.
*/ */
#ifndef pgd_addr_end
#define pgd_addr_end(addr, end) \ #define pgd_addr_end(addr, end) \
({ unsigned long __boundary = ((addr) + PGDIR_SIZE) & PGDIR_MASK; \ ({ unsigned long __boundary = ((addr) + PGDIR_SIZE) & PGDIR_MASK; \
(__boundary - 1 < (end) - 1)? __boundary: (end); \ (__boundary - 1 < (end) - 1)? __boundary: (end); \
}) })
#endif
#ifndef pud_addr_end #ifndef pud_addr_end
#define pud_addr_end(addr, end) \ #define pud_addr_end(addr, end) \
......
...@@ -561,32 +561,6 @@ do { \ ...@@ -561,32 +561,6 @@ do { \
#define __HAVE_ARCH_PGD_OFFSET_GATE #define __HAVE_ARCH_PGD_OFFSET_GATE
#define __HAVE_ARCH_LAZY_MMU_PROT_UPDATE #define __HAVE_ARCH_LAZY_MMU_PROT_UPDATE
/*
* Override for pgd_addr_end() to deal with the virtual address space holes
* in each region. In regions 0..4 virtual address bits are used like this:
* +--------+------+--------+-----+-----+--------+
* | pgdhi3 | rsvd | pgdlow | pmd | pte | offset |
* +--------+------+--------+-----+-----+--------+
* 'pgdlow' overflows to pgdhi3 (a.k.a. region bits) leaving rsvd==0
*/
#define IA64_PGD_OVERFLOW (PGDIR_SIZE << (PAGE_SHIFT-6))
#define pgd_addr_end(addr, end) \
({ unsigned long __boundary = ((addr) + PGDIR_SIZE) & PGDIR_MASK; \
if (REGION_NUMBER(__boundary) < 5 && \
__boundary & IA64_PGD_OVERFLOW) \
__boundary += (RGN_SIZE - 1) & ~(IA64_PGD_OVERFLOW - 1);\
(__boundary - 1 < (end) - 1)? __boundary: (end); \
})
#define pmd_addr_end(addr, end) \
({ unsigned long __boundary = ((addr) + PMD_SIZE) & PMD_MASK; \
if (REGION_NUMBER(__boundary) < 5 && \
__boundary & IA64_PGD_OVERFLOW) \
__boundary += (RGN_SIZE - 1) & ~(IA64_PGD_OVERFLOW - 1);\
(__boundary - 1 < (end) - 1)? __boundary: (end); \
})
#include <asm-generic/pgtable-nopud.h> #include <asm-generic/pgtable-nopud.h>
#include <asm-generic/pgtable.h> #include <asm-generic/pgtable.h>
......
...@@ -424,21 +424,6 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from, ...@@ -424,21 +424,6 @@ extern int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
#define GET_IOSPACE(pfn) (pfn >> (BITS_PER_LONG - 4)) #define GET_IOSPACE(pfn) (pfn >> (BITS_PER_LONG - 4))
#define GET_PFN(pfn) (pfn & 0x0fffffffffffffffUL) #define GET_PFN(pfn) (pfn & 0x0fffffffffffffffUL)
/* Override for {pgd,pmd}_addr_end() to deal with the virtual address
* space hole. We simply sign extend bit 43.
*/
#define pgd_addr_end(addr, end) \
({ unsigned long __boundary = ((addr) + PGDIR_SIZE) & PGDIR_MASK; \
__boundary = ((long) (__boundary << 20)) >> 20; \
(__boundary - 1 < (end) - 1)? __boundary: (end); \
})
#define pmd_addr_end(addr, end) \
({ unsigned long __boundary = ((addr) + PMD_SIZE) & PMD_MASK; \
__boundary = ((long) (__boundary << 20)) >> 20; \
(__boundary - 1 < (end) - 1)? __boundary: (end); \
})
#include <asm-generic/pgtable.h> #include <asm-generic/pgtable.h>
/* We provide our own get_unmapped_area to cope with VA holes for userland */ /* We provide our own get_unmapped_area to cope with VA holes for userland */
......
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