Skip to content

Commit d7110a2

Browse files
nathanchancesuryasaimadhu
authored andcommitted
x86/mmiotrace: Use cpumask_available() for cpumask_var_t variables
When building with Clang + -Wtautological-compare and CONFIG_CPUMASK_OFFSTACK unset: arch/x86/mm/mmio-mod.c:375:6: warning: comparison of array 'downed_cpus' equal to a null pointer is always false [-Wtautological-pointer-compare] if (downed_cpus == NULL && ^~~~~~~~~~~ ~~~~ arch/x86/mm/mmio-mod.c:405:6: warning: comparison of array 'downed_cpus' equal to a null pointer is always false [-Wtautological-pointer-compare] if (downed_cpus == NULL || cpumask_weight(downed_cpus) == 0) ^~~~~~~~~~~ ~~~~ 2 warnings generated. Commit f7e30f0 ("cpumask: Add helper cpumask_available()") added cpumask_available() to fix warnings of this nature. Use that here so that clang does not warn regardless of CONFIG_CPUMASK_OFFSTACK's value. Reported-by: Sedat Dilek <sedat.dilek@gmail.com> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Borislav Petkov <bp@suse.de> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Link: ClangBuiltLinux#982 Link: https://lkml.kernel.org/r/20200408205323.44490-1-natechancellor@gmail.com
1 parent b9bbe6e commit d7110a2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/mm/mmio-mod.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ static void enter_uniprocessor(void)
372372
int cpu;
373373
int err;
374374

375-
if (downed_cpus == NULL &&
375+
if (!cpumask_available(downed_cpus) &&
376376
!alloc_cpumask_var(&downed_cpus, GFP_KERNEL)) {
377377
pr_notice("Failed to allocate mask\n");
378378
goto out;
@@ -402,7 +402,7 @@ static void leave_uniprocessor(void)
402402
int cpu;
403403
int err;
404404

405-
if (downed_cpus == NULL || cpumask_weight(downed_cpus) == 0)
405+
if (!cpumask_available(downed_cpus) || cpumask_weight(downed_cpus) == 0)
406406
return;
407407
pr_notice("Re-enabling CPUs...\n");
408408
for_each_cpu(cpu, downed_cpus) {

0 commit comments

Comments
 (0)