x86/asm: Add pud_pgprot() and pmd_pgprot()

toshikani · KAGA-KOKO · commit bbac8c6deada · 2015-09-22T21:27:32.000+02:00
pte_pgprot() returns a pgprot_t value by calling pte_flags(). Now that pud_flags() and pmd_flags() work specifically for the pud/pmd levels, define pud_pgprot() and pmd_pgprot() for PUD/PMD. Also update pte_pgprot() to remove the unnecessary mask with PTE_FLAGS_MASK as pte_flags() takes care of it. Signed-off-by: Toshi Kani <toshi.kani@hpe.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Juergen Gross <jgross@suse.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Konrad Wilk <konrad.wilk@oracle.com> Cc: Robert Elliot <elliott@hpe.com> Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1442514264-12475-6-git-send-email-toshi.kani@hpe.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
@@ -379,7 +379,9 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
 	return __pgprot(preservebits | addbits);
 }
 
-#define pte_pgprot(x) __pgprot(pte_flags(x) & PTE_FLAGS_MASK)
+#define pte_pgprot(x) __pgprot(pte_flags(x))
+#define pmd_pgprot(x) __pgprot(pmd_flags(x))
+#define pud_pgprot(x) __pgprot(pud_flags(x))
 
 #define canon_pgprot(p) __pgprot(massage_pgprot(p))
 

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,9 @@ static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)`
`379`	`379`	`return __pgprot(preservebits \| addbits);`
`380`	`380`	`}`
`381`	`381`
`382`		`-#define pte_pgprot(x) __pgprot(pte_flags(x) & PTE_FLAGS_MASK)`
	`382`	`+#define pte_pgprot(x) __pgprot(pte_flags(x))`
	`383`	`+#define pmd_pgprot(x) __pgprot(pmd_flags(x))`
	`384`	`+#define pud_pgprot(x) __pgprot(pud_flags(x))`
`383`	`385`
`384`	`386`	`#define canon_pgprot(p) __pgprot(massage_pgprot(p))`
`385`	`387`