Commit 937fa39f authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

microblaze: 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: Michal Simek <monstr@monstr.eu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 22f9bf39

arch/microblaze/include/asm/pgtable.h

+0 −11
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ extern int mem_init_done; 
#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })

#define __swp_entry_to_pte(x)	((pte_t) { (x).val })



#ifndef __ASSEMBLY__

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

#endif /* __ASSEMBLY__ */



#define ZERO_PAGE(vaddr)	({ BUG(); NULL; })



#define swapper_pg_dir ((pgd_t *) NULL)
@@ -207,7 +203,6 @@ static inline pte_t pte_mkspecial(pte_t pte) { return pte; } 


/* Definitions for MicroBlaze. */

#define	_PAGE_GUARDED	0x001	/* G: page is guarded from prefetch */

#define _PAGE_FILE	0x001	/* when !present: nonlinear file mapping */

#define _PAGE_PRESENT	0x002	/* software: PTE contains a translation */

#define	_PAGE_NO_CACHE	0x004	/* I: caching is inhibited */

#define	_PAGE_WRITETHRU	0x008	/* W: caching is write-through */
@@ -337,7 +332,6 @@ static inline int pte_write(pte_t pte) { return pte_val(pte) & _PAGE_RW; } 
static inline int pte_exec(pte_t pte)  { return pte_val(pte) & _PAGE_EXEC; }

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 void pte_uncache(pte_t pte) { pte_val(pte) |= _PAGE_NO_CACHE; }

static inline void pte_cache(pte_t pte)   { pte_val(pte) &= ~_PAGE_NO_CACHE; }
@@ -499,11 +493,6 @@ static inline pmd_t *pmd_offset(pgd_t *dir, unsigned long address) 


#define pte_unmap(pte)		kunmap_atomic(pte)



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

#define PTE_FILE_MAX_BITS	29

#define pte_to_pgoff(pte)	(pte_val(pte) >> 3)

#define pgoff_to_pte(off)	((pte_t) { ((off) << 3) | _PAGE_FILE })



extern pgd_t swapper_pg_dir[PTRS_PER_PGD];



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE