vm: remove unused/broken page_pte[_prot] macros
PATCH 1/1 vm: remove unused/broken page_pte[_prot] macros
Hello, Andrew.
This patch removes page_pte_prot and page_pte macros from all
architectures. Some architectures define both, some only page_pte (broken) and others none. These macros are not used anywhere.
page_pte_prot(page, prot) is identical to mk_pte(page, prot) andpage_pte(page) is identical to page_pte_prot(page, __pgprot(0)).
* The following architectures define both page_pte_prot and page_pte
arm, arm26, ia64, sh64, sparc, sparc64
* The following architectures define only page_pte (broken)
frv, i386, m32r, mips, sh, x86-64
* All other architectures define neither
Signed-off-by Tejun Heo <[email protected]>
include/asm-arm/pgtable.h +0 -3
@@ -397,9 +397,6 @@ static inline pte_t *pmd_page_kernel(pmd#define pgd_clear (pgdp) do { } while (0)#define set_pgd (pgd,pgdp) do { } while (0) -#define page_pte_prot (page,prot) mk_pte(page, prot) -#define page_pte (page) mk_pte(page, __pgprot(0)) -/* to find an entry in a page-table-directory */ #define pgd_index (addr) ((addr) >> PGDIR_SHIFT)
include/asm-arm26/pgtable.h +0 -2
@@ -98,8 +98,6 @@ extern struct page *empty_zero_page;#define pfn_pte (pfn,prot) (__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))#define pages_to_mb (x) ((x) >> (20 - PAGE_SHIFT))#define mk_pte (page,prot) pfn_pte(page_to_pfn(page),prot) -#define page_pte_prot (page,prot) mk_pte(page, prot) -#define page_pte (page) mk_pte(page, __pgprot(0))/* * Terminology: PGD = Page Directory, PMD = Page Middle Directory,
include/asm-frv/pgtable.h +0 -2
@@ -436,8 +436,6 @@ static inline pte_t pte_modify(pte_t ptereturn pte; } -#define page_pte (page) page_pte_prot((page), __pgprot(0)) -/* to find an entry in a page-table-directory. */ #define pgd_index (address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))#define pgd_index_k (addr) pgd_index(addr)
include/asm-i386/pgtable.h +0 -2
@@ -322,8 +322,6 @@ static inline pte_t pte_modify(pte_t ptereturn pte; } -#define page_pte (page) page_pte_prot(page, __pgprot(0)) -#define pmd_large (pmd) \ ((pmd_val(pmd) & (_PAGE_PSE|_PAGE_PRESENT)) == (_PAGE_PSE|_PAGE_PRESENT))
include/asm-ia64/pgtable.h +0 -3
@@ -236,9 +236,6 @@ ia64_phys_addr_valid (unsigned long addr#define pte_modify (_pte, newprot) \ (__pte((pte_val(_pte) & ~_PAGE_CHG_MASK) | (pgprot_val(newprot) & _PAGE_CHG_MASK))) -#define page_pte_prot (page,prot) mk_pte(page, prot) -#define page_pte (page) page_pte_prot(page, __pgprot(0)) -#define pte_none (pte) (!pte_val(pte))#define pte_present (pte) (pte_val(pte) & (_PAGE_P | _PAGE_PROTNONE))#define pte_clear (mm,addr,pte) (pte_val(*(pte)) = 0UL)
include/asm-m32r/pgtable.h +0 -2
@@ -324,8 +324,6 @@ static inline pte_t pte_modify(pte_t ptereturn pte; } -#define page_pte (page) page_pte_prot(page, __pgprot(0)) -/* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to.
include/asm-mips/pgtable-64.h +0 -1
@@ -157,7 +157,6 @@ static inline void pgd_clear(pgd_t *pgdp#endif #define __pgd_offset (address) pgd_index(address) -#define page_pte (page) page_pte_prot(page, __pgprot(0))/* to find an entry in a kernel page-table-directory */ #define pgd_offset_k (address) pgd_offset(&init_mm, 0)
include/asm-mips/pgtable.h +0 -1
@@ -76,7 +76,6 @@ extern void paging_init(void);* Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. */ -#define page_pte (page) page_pte_prot(page, __pgprot(0))#define pmd_phys (pmd) (pmd_val(pmd) - PAGE_OFFSET)#define pmd_page (pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))#define pmd_page_kernel (pmd) pmd_val(pmd)
include/asm-sh/pgtable.h +0 -2
@@ -224,8 +224,6 @@ static inline pgprot_t pgprot_noncached(static inline pte_t pte_modify (pte_t pte,pgprot_t newprot) {set_pte (&pte,__pte ((pte_val (pte) & _PAGE_CHG_MASK) |pgprot_val (newprot)));return pte; } -#define page_pte (page) page_pte_prot(page, __pgprot(0)) -#define pmd_page_kernel (pmd) \ ((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
include/asm-sh64/pgtable.h +0 -3
@@ -457,9 +457,6 @@ extern inline pte_t pte_mkhuge(pte_t pteextern inline pte_t pte_modify (pte_t pte,pgprot_t newprot) {set_pte (&pte,__pte ((pte_val (pte) & _PAGE_CHG_MASK) |pgprot_val (newprot)));return pte; } -#define page_pte_prot (page, prot) mk_pte(page, prot) -#define page_pte (page) page_pte_prot(page, __pgprot(0)) -typedef pte_t *pte_addr_t ;#define pgtable_cache_init () do { } while (0)
include/asm-sparc/pgtable.h +0 -2
@@ -255,8 +255,6 @@ BTFIXUPDEF_CALL_CONST(pte_t, pte_mkyoung#define pte_mkdirty (pte) BTFIXUP_CALL(pte_mkdirty)(pte)#define pte_mkyoung (pte) BTFIXUP_CALL(pte_mkyoung)(pte) -#define page_pte_prot (page, prot) mk_pte(page, prot) -#define page_pte (page) mk_pte(page, __pgprot(0))#define pfn_pte (pfn, prot) mk_pte(pfn_to_page(pfn), prot) BTFIXUPDEF_CALL(unsigned long, pte_pfn, pte_t)
include/asm-sparc64/pgtable.h +0 -3
@@ -231,9 +231,6 @@ extern struct page *mem_map_zero;#define pte_pfn (x) ((pte_val(x) & _PAGE_PADDR)>>PAGE_SHIFT)#define pte_page (x) pfn_to_page(pte_pfn(x)) -#define page_pte_prot (page, prot) mk_pte(page, prot) -#define page_pte (page) page_pte_prot(page, __pgprot(0)) -static inline pte_t pte_modify (pte_t orig_pte,pgprot_t new_prot) {pte_t __pte;
include/asm-x86_64/pgtable.h +0 -2
@@ -318,8 +318,6 @@ static inline int pmd_large(pmd_t pte) {* and a page entry and page directory to the page they refer to. */ -#define page_pte (page) page_pte_prot(page, __pgprot(0)) -/* * Level 4 access. */