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

Commit e8a48524 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/pgtable: unify pagetable accessors, #5 



reorder. NOP.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7d00a1ae

include/asm-x86/pgtable_32.h

+6 −11
Original line number Diff line number Diff line
@@ -108,28 +108,23 @@ extern unsigned long pg0[]; 
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_write(pte_t pte)		{ return pte_val(pte) & _PAGE_RW; }

static inline int pte_file(pte_t pte)		{ return pte_val(pte) & _PAGE_FILE; }

static inline int pte_huge(pte_t pte)		{ return pte_val(pte) & _PAGE_PSE; }



/*

 * 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 pmd_large(pmd_t pte) {

	return (pmd_val(pte) & (_PAGE_PSE|_PAGE_PRESENT)) ==

		(_PAGE_PSE|_PAGE_PRESENT);

}



static inline pte_t pte_mkclean(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_DIRTY); }

static inline pte_t pte_mkold(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_ACCESSED); }

static inline pte_t pte_wrprotect(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_RW); }

static inline pte_t pte_mkexec(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_NX); }

static inline pte_t pte_mkdirty(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_DIRTY); }

static inline pte_t pte_mkyoung(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_ACCESSED); }

static inline pte_t pte_mkwrite(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_RW); }

static inline pte_t pte_mkhuge(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_PSE); }



static inline pte_t pte_clrhuge(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_PSE); }

static inline pte_t pte_mkexec(pte_t pte)	{ return __pte(pte_val(pte) & ~_PAGE_NX); }



static inline int pmd_large(pmd_t pte) {

	return (pmd_val(pte) & (_PAGE_PSE|_PAGE_PRESENT)) ==

		(_PAGE_PSE|_PAGE_PRESENT);

}



#ifdef CONFIG_X86_PAE

# include <asm/pgtable-3level.h>