3 files changed, 9 insertions, 4 deletions

diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
index e8a1e69eb92c..25d803148f5c 100644
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -122,10 +122,14 @@ static bool ignore_func(struct objtool_file *file, struct symbol *func)
 
         /* check for STACK_FRAME_NON_STANDARD */
         if (file->whitelist && file->whitelist->rela)
-                list_for_each_entry(rela, &file->whitelist->rela->rela_list, list)
-                        if (rela->sym->sec == func->sec &&
+                list_for_each_entry(rela, &file->whitelist->rela->rela_list, list) {
+                        if (rela->sym->type == STT_SECTION &&
+                            rela->sym->sec == func->sec &&
                             rela->addend == func->offset)
                                 return true;
+                        if (rela->sym->type == STT_FUNC && rela->sym == func)
+                                return true;
+                }
 
         /* check if it has a context switching instruction */
         func_for_each_insn(file, func, insn)
diff --git a/tools/testing/radix-tree/tag_check.c b/tools/testing/radix-tree/tag_check.c
index b7447ceb75e9..b0ac05741750 100644
--- a/tools/testing/radix-tree/tag_check.c
+++ b/tools/testing/radix-tree/tag_check.c
@@ -122,7 +122,7 @@ enum {
         NODE_TAGGED = 2,
 };
 
-#define THRASH_SIZE             1000 * 1000
+#define THRASH_SIZE             (1000 * 1000)
 #define N 127
 #define BATCH   33
 
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c
index 7cf6e1769903..b9d34b37c017 100644
--- a/tools/vm/slabinfo.c
+++ b/tools/vm/slabinfo.c
@@ -510,10 +510,11 @@ static void slab_stats(struct slabinfo *s)
                         s->alloc_node_mismatch, (s->alloc_node_mismatch * 100) / total);
         }
 
-        if (s->cmpxchg_double_fail || s->cmpxchg_double_cpu_fail)
+        if (s->cmpxchg_double_fail || s->cmpxchg_double_cpu_fail) {
                 printf("\nCmpxchg_double Looping\n------------------------\n");
                 printf("Locked Cmpxchg Double redos   %lu\nUnlocked Cmpxchg Double redos %lu\n",
                         s->cmpxchg_double_fail, s->cmpxchg_double_cpu_fail);
+        }
 }
 
 static void report(struct slabinfo *s)