| Message ID | 20190812033120.43013-6-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Clang build fixes for MIPS | expand |
Hello, Nathan Chancellor wrote: > clang warns: > > arch/mips/mm/tlbex.c:634:19: error: use of logical '&&' with constant > operand [-Werror,-Wconstant-logical-operand] > if (cpu_has_rixi && _PAGE_NO_EXEC) { > ^ ~~~~~~~~~~~~~ > arch/mips/mm/tlbex.c:634:19: note: use '&' for a bitwise operation > if (cpu_has_rixi && _PAGE_NO_EXEC) { > ^~ > & > arch/mips/mm/tlbex.c:634:19: note: remove constant to silence this > warning > if (cpu_has_rixi && _PAGE_NO_EXEC) { > ~^~~~~~~~~~~~~~~~ > 1 error generated. > > Explicitly cast this value to a boolean so that clang understands we > intend for this to be a non-zero value. > > Fixes: 00bf1c691d08 ("MIPS: tlbex: Avoid placing software PTE bits in Entry* PFN fields") Applied to mips-next. > commit c59ae0a10551 > https://git.kernel.org/mips/c/c59ae0a10551 > > Fixes: 00bf1c691d08 ("MIPS: tlbex: Avoid placing software PTE bits in Entry* PFN fields") > Link: https://github.com/ClangBuiltLinux/linux/issues/609 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > Signed-off-by: Paul Burton <paul.burton@mips.com> Thanks, Paul [ This message was auto-generated; if you believe anything is incorrect then please email paul.burton@mips.com to report it. ]
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index eb21277f4141..071d48593464 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c @@ -629,7 +629,7 @@ static __maybe_unused void build_convert_pte_to_entrylo(u32 **p, return; } - if (cpu_has_rixi && _PAGE_NO_EXEC) { + if (cpu_has_rixi && !!_PAGE_NO_EXEC) { if (fill_includes_sw_bits) { UASM_i_ROTR(p, reg, reg, ilog2(_PAGE_GLOBAL)); } else {
clang warns: arch/mips/mm/tlbex.c:634:19: error: use of logical '&&' with constant operand [-Werror,-Wconstant-logical-operand] if (cpu_has_rixi && _PAGE_NO_EXEC) { ^ ~~~~~~~~~~~~~ arch/mips/mm/tlbex.c:634:19: note: use '&' for a bitwise operation if (cpu_has_rixi && _PAGE_NO_EXEC) { ^~ & arch/mips/mm/tlbex.c:634:19: note: remove constant to silence this warning if (cpu_has_rixi && _PAGE_NO_EXEC) { ~^~~~~~~~~~~~~~~~ 1 error generated. Explicitly cast this value to a boolean so that clang understands we intend for this to be a non-zero value. Fixes: 00bf1c691d08 ("MIPS: tlbex: Avoid placing software PTE bits in Entry* PFN fields") Link: https://github.com/ClangBuiltLinux/linux/issues/609 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- arch/mips/mm/tlbex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)