Commit 3ee802ea authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

nios2: drop _PAGE_FILE and pte_file()-related helpers 



We've replaced remap_file_pages(2) implementation with emulation.  Nobody
creates non-linear mapping anymore.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Ley Foon Tan <lftan@altera.com>
Reviewed-by: default avatarTobias Klauser <tklauser@distanz.ch>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6bf63a8c

arch/nios2/include/asm/pgtable-bits.h

+0 −1
Original line number Diff line number Diff line
@@ -30,6 +30,5 @@ 
#define _PAGE_PRESENT	(1<<25)	/* PTE contains a translation */

#define _PAGE_ACCESSED	(1<<26)	/* page referenced */

#define _PAGE_DIRTY	(1<<27)	/* dirty page */

#define _PAGE_FILE	(1<<28)	/* PTE used for file mapping or swap */



#endif /* _ASM_NIOS2_PGTABLE_BITS_H */

arch/nios2/include/asm/pgtable.h

+1 −9
Original line number Diff line number Diff line
@@ -112,8 +112,6 @@ static inline int pte_dirty(pte_t pte) \ 
	{ return pte_val(pte) & _PAGE_DIRTY; }

static inline int pte_young(pte_t pte)		\

	{ return pte_val(pte) & _PAGE_ACCESSED; }

static inline int pte_file(pte_t pte)		\

	{ return pte_val(pte) & _PAGE_FILE; }

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



#define pgprot_noncached pgprot_noncached
@@ -272,8 +270,7 @@ static inline void pte_clear(struct mm_struct *mm, 
		__FILE__, __LINE__, pgd_val(e))



/*

 * Encode and decode a swap entry (must be !pte_none(pte) && !pte_present(pte)

 * && !pte_file(pte)):

 * Encode and decode a swap entry (must be !pte_none(pte) && !pte_present(pte):

 *

 * 31 30 29 28 27 26 25 24 23 22 21 20 19 18 ...  1  0

 *  0  0  0  0 type.  0  0  0  0  0  0 offset.........
@@ -290,11 +287,6 @@ static inline void pte_clear(struct mm_struct *mm, 
#define __swp_entry_to_pte(swp)	((pte_t) { (swp).val })

#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })



/* Encode and decode a nonlinear file mapping entry */

#define PTE_FILE_MAX_BITS	25

#define pte_to_pgoff(pte)	(pte_val(pte) & 0x1ffffff)

#define pgoff_to_pte(off)	__pte(((off) & 0x1ffffff) | _PAGE_FILE)



#define kern_addr_valid(addr)		(1)



#include <asm-generic/pgtable.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE