| Message ID | 20210203184323.20792-5-cmr@codefail.de (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Improve signal performance on PPC64 with KUAP | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (44158b256b30415079588d0fcb1bccbdc2ccd009) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
Hi Chris, (totally bikeshedding, but I'd use the full word parameter in the subject if you have enough spare characters.) > Unlike the other MSR_TM_* macros, MSR_TM_ACTIVE does not reference or > use its parameter unless CONFIG_PPC_TRANSACTIONAL_MEM is defined. This > causes an 'unused variable' compile warning unless the variable is also > guarded with CONFIG_PPC_TRANSACTIONAL_MEM. > > Reference but do nothing with the argument in the macro to avoid a > potential compile warning. Andrew asked why we weren't seeing these warnings already. I was able to reproduce them with CONFIG_PPC_TRANSACTIONAL_MEM off, but only if I compiled with W=1: arch/powerpc/kernel/process.c: In function ‘enable_kernel_fp’: arch/powerpc/kernel/process.c:210:16: error: variable ‘cpumsr’ set but not used [-Werror=unused-but-set-variable] 210 | unsigned long cpumsr; | ^~~~~~ Having said that, this change seems like a good idea, squashing warnings at W=1 is still valuable. Reviewed-by: Daniel Axtens <dja@axtens.net> Kind regards, Daniel > Signed-off-by: Christopher M. Riedl <cmr@codefail.de> > --- > arch/powerpc/include/asm/reg.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h > index e40a921d78f9..c5a3e856191c 100644 > --- a/arch/powerpc/include/asm/reg.h > +++ b/arch/powerpc/include/asm/reg.h > @@ -124,7 +124,7 @@ > #ifdef CONFIG_PPC_TRANSACTIONAL_MEM > #define MSR_TM_ACTIVE(x) (((x) & MSR_TS_MASK) != 0) /* Transaction active? */ > #else > -#define MSR_TM_ACTIVE(x) 0 > +#define MSR_TM_ACTIVE(x) ((void)(x), 0) > #endif > > #if defined(CONFIG_PPC_BOOK3S_64) > -- > 2.26.1
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index e40a921d78f9..c5a3e856191c 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -124,7 +124,7 @@ #ifdef CONFIG_PPC_TRANSACTIONAL_MEM #define MSR_TM_ACTIVE(x) (((x) & MSR_TS_MASK) != 0) /* Transaction active? */ #else -#define MSR_TM_ACTIVE(x) 0 +#define MSR_TM_ACTIVE(x) ((void)(x), 0) #endif #if defined(CONFIG_PPC_BOOK3S_64)
Unlike the other MSR_TM_* macros, MSR_TM_ACTIVE does not reference or use its parameter unless CONFIG_PPC_TRANSACTIONAL_MEM is defined. This causes an 'unused variable' compile warning unless the variable is also guarded with CONFIG_PPC_TRANSACTIONAL_MEM. Reference but do nothing with the argument in the macro to avoid a potential compile warning. Signed-off-by: Christopher M. Riedl <cmr@codefail.de> --- arch/powerpc/include/asm/reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)