m32r: drop _PAGE_FILE and pte_file()-related helpers (406b16e2) · Commits · 戴 / test

arch/m32r/include/asm/pgtable-2level.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -70,9 +70,5 @@ static inline pmd_t pmd_offset(pgd_t dir, unsigned long address)
		#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) \| pgprot_val(prot))
		#define pfn_pmd(pfn, prot) __pmd(((pfn) << PAGE_SHIFT) \| pgprot_val(prot))

		#define PTE_FILE_MAX_BITS 29
		#define pte_to_pgoff(pte) (((pte_val(pte) >> 2) & 0x7f) \| (((pte_val(pte) >> 10)) << 7))
		#define pgoff_to_pte(off) ((pte_t) { (((off) & 0x7f) << 2) \| (((off) >> 7) << 10) \| _PAGE_FILE })

		#endif /* __KERNEL__ */
		#endif /* _ASM_M32R_PGTABLE_2LEVEL_H */

+0 −11

Original line number	Diff line number	Diff line
		@@ -80,8 +80,6 @@ extern unsigned long empty_zero_page[1024];
		*/

		#define _PAGE_BIT_DIRTY 0 /* software: page changed */
		#define _PAGE_BIT_FILE 0 /* when !present: nonlinear file
		mapping */
		#define _PAGE_BIT_PRESENT 1 /* Valid: page is valid */
		#define _PAGE_BIT_GLOBAL 2 /* Global */
		#define _PAGE_BIT_LARGE 3 /* Large */
		@@ -93,7 +91,6 @@ extern unsigned long empty_zero_page[1024];
		#define _PAGE_BIT_PROTNONE 9 /* software: if not present */

		#define _PAGE_DIRTY (1UL << _PAGE_BIT_DIRTY)
		#define _PAGE_FILE (1UL << _PAGE_BIT_FILE)
		#define _PAGE_PRESENT (1UL << _PAGE_BIT_PRESENT)
		#define _PAGE_GLOBAL (1UL << _PAGE_BIT_GLOBAL)
		#define _PAGE_LARGE (1UL << _PAGE_BIT_LARGE)
		@@ -206,14 +203,6 @@ static inline int pte_write(pte_t pte)
		return pte_val(pte) & _PAGE_WRITE;
		}

		/*
		* The following only works if pte_present() is not true.
		*/
		static inline int pte_file(pte_t pte)
		{
		return pte_val(pte) & _PAGE_FILE;
		}

		static inline int pte_special(pte_t pte)
		{
		return 0;