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

Commit c6ca18eb authored by Andi Kleen's avatar Andi Kleen Committed by Ingo Molnar
Browse files

x86: add pte_pgprot to 32-bit 



64bit already had it.

Needed for later patches.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Acked-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c93c82bb

include/asm-x86/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	return __pte(val);

}



#define pte_pgprot(x) __pgprot(pte_val(x) & (0xfff | _PAGE_NX))



#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>

#else  /* !CONFIG_PARAVIRT */

include/asm-x86/pgtable_64.h

+0 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ static inline void native_pgd_clear(pgd_t * pgd) 


#define pte_same(a, b)		((a).pte == (b).pte)



#define pte_pgprot(a)	(__pgprot((a).pte & ~PHYSICAL_PAGE_MASK))



#endif /* !__ASSEMBLY__ */



#define PMD_SIZE	(_AC(1,UL) << PMD_SHIFT)