x86/mm: Use pgprotval_t in protval_4k_2_large() and protval_large_2_4k() (325518e9) · Commits · 戴 / test

Use the proper type for "raw" page table values. Signed-off-by:

arch/x86/include/asm/pgtable_types.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ static inline pteval_t pte_flags(pte_t pte)

		unsigned long cachemode2protval(enum page_cache_mode pcm);

		static inline unsigned long protval_4k_2_large(unsigned long val)
		static inline pgprotval_t protval_4k_2_large(pgprotval_t val)
		{
		return (val & ~(_PAGE_PAT \| _PAGE_PAT_LARGE)) \|
		((val & _PAGE_PAT) << (_PAGE_BIT_PAT_LARGE - _PAGE_BIT_PAT));
		@@ -487,7 +487,7 @@ static inline pgprot_t pgprot_4k_2_large(pgprot_t pgprot)
		{
		return __pgprot(protval_4k_2_large(pgprot_val(pgprot)));
		}
		static inline unsigned long protval_large_2_4k(unsigned long val)
		static inline pgprotval_t protval_large_2_4k(pgprotval_t val)
		{
		return (val & ~(_PAGE_PAT \| _PAGE_PAT_LARGE)) \|
		((val & _PAGE_PAT_LARGE) >>