Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1426d7a8 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

[PATCH] vm: remove unused/broken page_pte[_prot] macros 



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) and
page_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: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c7e9dd4d

include/asm-arm/pgtable.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -397,9 +397,6 @@ static inline pte_t *pmd_page_kernel(pmd_t pmd) 
#define pgd_clear(pgdp)		do { } while (0)

#define pgd_clear(pgdp)		do { } while (0)

#define set_pgd(pgd,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 */

/* to find an entry in a page-table-directory */

#define pgd_index(addr)		((addr) >> PGDIR_SHIFT)

#define pgd_index(addr)		((addr) >> PGDIR_SHIFT)

include/asm-arm26/pgtable.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -98,8 +98,6 @@ extern struct page *empty_zero_page; 
#define pfn_pte(pfn,prot)	(__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))

#define pfn_pte(pfn,prot)	(__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))

#define pages_to_mb(x)		((x) >> (20 - PAGE_SHIFT))

#define pages_to_mb(x)		((x) >> (20 - PAGE_SHIFT))

#define mk_pte(page,prot)	pfn_pte(page_to_pfn(page),prot)

#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,

 * Terminology: PGD = Page Directory, PMD = Page Middle Directory,

include/asm-frv/pgtable.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -436,8 +436,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	return pte;

	return pte;

}

}





#define page_pte(page)	page_pte_prot((page), __pgprot(0))



/* to find an entry in a page-table-directory. */

/* to find an entry in a page-table-directory. */

#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))

#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))

#define pgd_index_k(addr) pgd_index(addr)

#define pgd_index_k(addr) pgd_index(addr)

include/asm-i386/pgtable.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -323,8 +323,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	return pte;

	return pte;

}

}





#define page_pte(page) page_pte_prot(page, __pgprot(0))



#define pmd_large(pmd) \

#define pmd_large(pmd) \

((pmd_val(pmd) & (_PAGE_PSE|_PAGE_PRESENT)) == (_PAGE_PSE|_PAGE_PRESENT))

((pmd_val(pmd) & (_PAGE_PSE|_PAGE_PRESENT)) == (_PAGE_PSE|_PAGE_PRESENT))

include/asm-ia64/pgtable.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -236,9 +236,6 @@ ia64_phys_addr_valid (unsigned long addr) 
#define pte_modify(_pte, newprot) \

#define pte_modify(_pte, newprot) \

	(__pte((pte_val(_pte) & ~_PAGE_CHG_MASK) | (pgprot_val(newprot) & _PAGE_CHG_MASK)))

	(__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_none(pte) 			(!pte_val(pte))

#define pte_present(pte)		(pte_val(pte) & (_PAGE_P | _PAGE_PROTNONE))

#define pte_present(pte)		(pte_val(pte) & (_PAGE_P | _PAGE_PROTNONE))

#define pte_clear(mm,addr,pte)		(pte_val(*(pte)) = 0UL)

#define pte_clear(mm,addr,pte)		(pte_val(*(pte)) = 0UL)