x86: fix pgprotval_t format string
PATCH 1/1 x86: fix pgprotval_t format string
On 32-bit builds, pgprotval_t can be either 32-bit or 64-bit wide depending on the page table layout. In the latter case, we now get a build warning:
In file included from arch/x86/include/asm/bug.h:83,
from include/linux/bug.h:5,
from include/linux/crypto.h:23,
from arch/x86/kernel/asm-offsets.c:9:arch/x86/include/asm/pgtable.h: In function 'check_pgprot':arch/x86/include/asm/pgtable.h:536:5: error: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'pgprotval_t' {aka 'long long unsigned int'} [-Werror=format=]
To work around the problem, we can always print the value as a u64, and add the respective cast.
--- arch/x86/include/asm/pgtable.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/include/asm/pgtable.h +5 -5
@@ -533,11 +533,11 @@ static inline pgprotval_t check_pgprot(pgprot_t pgprot)/* mmdebug.h can not be included here because of dependencies */ #ifdef CONFIG_DEBUG_VM WARN_ONCE (pgprot_val (pgprot) != massaged_val, -"attempted to set unsupported pgprot: %016lx " -"bits: %016lx supported: %016lx\n" , -pgprot_val (pgprot), -pgprot_val (pgprot) ^ massaged_val, - __supported_pte_mask); +"attempted to set unsupported pgprot: %016llx " +"bits: %016llx supported: %016llx\n" , + (u64 )pgprot_val (pgprot), + (u64 )pgprot_val (pgprot) ^ massaged_val, + (u64 )__supported_pte_mask);#endif return massaged_val;
Signature · 1 line
2.9.0
Quoted 7 lines · Arnd Bergmann
arch/x86/include/asm/pgtable.h +0
-1@@ -533,11 +533,11 @@ static inline pgprotval_t check_pgprot(pgprot_t pgprot)/* mmdebug.h can not be included here because of dependencies */ #ifdef CONFIG_DEBUG_VM WARN_ONCE(pgprot_val(pgprot) != massaged_val, - "attempted to set unsupported pgprot: %016lx "
arch/x86/include/asm/pgtable.h static inline pgprotval_t check_pgprot(pgprot_t pgprot) · line 541
Quoted 10 lines
arch/x86/include/asm/pgtable.h +5
-4-"bits: %016lx supported: %016lx\n" , -pgprot_val (pgprot), -pgprot_val (pgprot) ^ massaged_val, - __supported_pte_mask); +"attempted to set unsupported pgprot: %016llx " +"bits: %016llx supported: %016llx\n" , + (u64 )pgprot_val (pgprot), + (u64 )pgprot_val (pgprot) ^ massaged_val, + (u64)__supported_pte_mask);#endif
Whoops, I just sent a similar patch. I just used 'unsigned long long' instead of u64. I'm fine with this as well, and don't prefer one over the other, so: