Skip to content

Commit 1426d7a

Browse files
htejunLinus Torvalds
htejun
authored and
Linus Torvalds
committed
[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: Tejun Heo <htejun@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
1 parent c7e9dd4 commit 1426d7a

File tree

13 files changed

+0
-28
lines changed

13 files changed

+0
-28
lines changed

‎include/asm-arm/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -397,9 +397,6 @@ static inline pte_t *pmd_page_kernel(pmd_t pmd)
397397
#define pgd_clear(pgdp) do { } while (0)
398398
#define set_pgd(pgd,pgdp) do { } while (0)
399399

400-
#define page_pte_prot(page,prot) mk_pte(page, prot)
401-
#define page_pte(page) mk_pte(page, __pgprot(0))
402-
403400
/* to find an entry in a page-table-directory */
404401
#define pgd_index(addr) ((addr) >> PGDIR_SHIFT)
405402

‎include/asm-arm26/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ extern struct page *empty_zero_page;
9898
#define pfn_pte(pfn,prot) (__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)))
9999
#define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT))
100100
#define mk_pte(page,prot) pfn_pte(page_to_pfn(page),prot)
101-
#define page_pte_prot(page,prot) mk_pte(page, prot)
102-
#define page_pte(page) mk_pte(page, __pgprot(0))
103101

104102
/*
105103
* Terminology: PGD = Page Directory, PMD = Page Middle Directory,

‎include/asm-frv/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
436436
return pte;
437437
}
438438

439-
#define page_pte(page) page_pte_prot((page), __pgprot(0))
440-
441439
/* to find an entry in a page-table-directory. */
442440
#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))
443441
#define pgd_index_k(addr) pgd_index(addr)

‎include/asm-i386/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
323323
return pte;
324324
}
325325

326-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
327-
328326
#define pmd_large(pmd) \
329327
((pmd_val(pmd) & (_PAGE_PSE|_PAGE_PRESENT)) == (_PAGE_PSE|_PAGE_PRESENT))
330328

‎include/asm-ia64/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,9 +236,6 @@ ia64_phys_addr_valid (unsigned long addr)
236236
#define pte_modify(_pte, newprot) \
237237
(__pte((pte_val(_pte) & ~_PAGE_CHG_MASK) | (pgprot_val(newprot) & _PAGE_CHG_MASK)))
238238

239-
#define page_pte_prot(page,prot) mk_pte(page, prot)
240-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
241-
242239
#define pte_none(pte) (!pte_val(pte))
243240
#define pte_present(pte) (pte_val(pte) & (_PAGE_P | _PAGE_PROTNONE))
244241
#define pte_clear(mm,addr,pte) (pte_val(*(pte)) = 0UL)

‎include/asm-m32r/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
324324
return pte;
325325
}
326326

327-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
328-
329327
/*
330328
* Conversion functions: convert a page and protection to a page entry,
331329
* and a page entry and page directory to the page they refer to.

‎include/asm-mips/pgtable-64.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ static inline void pud_clear(pud_t *pudp)
169169
#define __pgd_offset(address) pgd_index(address)
170170
#define __pud_offset(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD-1))
171171
#define __pmd_offset(address) pmd_index(address)
172-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
173172

174173
/* to find an entry in a kernel page-table-directory */
175174
#define pgd_offset_k(address) pgd_offset(&init_mm, 0)

‎include/asm-mips/pgtable.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ extern void paging_init(void);
7575
* Conversion functions: convert a page and protection to a page entry,
7676
* and a page entry and page directory to the page they refer to.
7777
*/
78-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
7978
#define pmd_phys(pmd) (pmd_val(pmd) - PAGE_OFFSET)
8079
#define pmd_page(pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))
8180
#define pmd_page_kernel(pmd) pmd_val(pmd)

‎include/asm-sh/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,6 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot)
224224
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
225225
{ set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot))); return pte; }
226226

227-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
228-
229227
#define pmd_page_kernel(pmd) \
230228
((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))
231229

‎include/asm-sh64/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -457,9 +457,6 @@ extern inline pte_t pte_mkhuge(pte_t pte) { set_pte(&pte, __pte(pte_val(pte) | _
457457
extern inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
458458
{ set_pte(&pte, __pte((pte_val(pte) & _PAGE_CHG_MASK) | pgprot_val(newprot))); return pte; }
459459

460-
#define page_pte_prot(page, prot) mk_pte(page, prot)
461-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
462-
463460
typedef pte_t *pte_addr_t;
464461
#define pgtable_cache_init() do { } while (0)
465462

‎include/asm-sparc/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,6 @@ BTFIXUPDEF_CALL_CONST(pte_t, pte_mkyoung, pte_t)
255255
#define pte_mkdirty(pte) BTFIXUP_CALL(pte_mkdirty)(pte)
256256
#define pte_mkyoung(pte) BTFIXUP_CALL(pte_mkyoung)(pte)
257257

258-
#define page_pte_prot(page, prot) mk_pte(page, prot)
259-
#define page_pte(page) mk_pte(page, __pgprot(0))
260258
#define pfn_pte(pfn, prot) mk_pte(pfn_to_page(pfn), prot)
261259

262260
BTFIXUPDEF_CALL(unsigned long, pte_pfn, pte_t)

‎include/asm-sparc64/pgtable.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,6 @@ extern struct page *mem_map_zero;
231231
#define pte_pfn(x) ((pte_val(x) & _PAGE_PADDR)>>PAGE_SHIFT)
232232
#define pte_page(x) pfn_to_page(pte_pfn(x))
233233

234-
#define page_pte_prot(page, prot) mk_pte(page, prot)
235-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
236-
237234
static inline pte_t pte_modify(pte_t orig_pte, pgprot_t new_prot)
238235
{
239236
pte_t __pte;

‎include/asm-x86_64/pgtable.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,6 @@ static inline int pmd_large(pmd_t pte) {
318318
* and a page entry and page directory to the page they refer to.
319319
*/
320320

321-
#define page_pte(page) page_pte_prot(page, __pgprot(0))
322-
323321
/*
324322
* Level 4 access.
325323
*/

0 commit comments

Comments
 (0)