Skip to contentSkip to conversation

Patch "tools include: Add a __fallthrough statement" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jul 13, 2017 Stable branch

lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tools include: Add a __fallthrough statement

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-include-add-a-__fallthrough-statement.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From b5bf1733d6a391c4e90ea8f8468d83023be74a2a Mon Sep 17 00:00:00 2001

From: Arnaldo Carvalho de Melo <[email protected]>
Date: Wed, 8 Feb 2017 17:01:46 -0300
Subject: tools include: Add a __fallthrough statement

From: Arnaldo Carvalho de Melo <[email protected]>

commit b5bf1733d6a391c4e90ea8f8468d83023be74a2a upstream.

For cases where implicit fall through case labels are intended, to let us inform that to gcc >= 7:

CC /tmp/build/perf/util/string.o
util/string.c: In function 'perf_atoll':
util/string.c:22:7: error: this statement may fall through [-Werror=implicit-fallthrough=]

      if (*p)
         ^
  util/string.c:24:3: note: here
     case '\0':
     ^~~~

So we introduce:

  #define __fallthrough __attribute__ ((fallthrough))

And use it in such cases.

---
 tools/include/linux/compiler.h |    9 +++++++++
 1 file changed, 9 insertions(+)
tools/include/linux/compiler.h +9 -0
@@ -126,4 +126,13 @@ static __always_inline void __write_once
 #define WRITE_ONCE(x, val) \
 	({ union { typeof(x) __val; char __c[1]; } __u = { .__val = (val) }; __write_once_size(&(x), __u.__c, sizeof(x)); __u.__val; })
 
+
+#ifndef __fallthrough
+# if defined(__GNUC__) && __GNUC__ >= 7
+#  define __fallthrough __attribute__ ((fallthrough))
+# else
+#  define __fallthrough
+# endif
+#endif
+
 #endif /* _TOOLS_LINUX_COMPILER_H */

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/perf-thread_map-correctly-size-buffer-used-with-dirent-dt_name.patch queue-4.9/perf-tests-avoid-possible-truncation-with-dirent-d_name-snprintf.patch queue-4.9/perf-top-use-__fallthrough.patch queue-4.9/perf-scripting-perl-fix-compile-error-with-some-perl5-versions.patch queue-4.9/perf-bench-numa-avoid-possible-truncation-when-using-snprintf.patch queue-4.9/perf-probe-add-error-checks-to-offline-probe-post-processing.patch queue-4.9/perf-header-fix-handling-of-perf_event_update__scale.patch queue-4.9/tools-string-use-__fallthrough-in-perf_atoll.patch queue-4.9/perf-intel-pt-use-__fallthrough.patch queue-4.9/tools-include-add-a-__fallthrough-statement.patch queue-4.9/tools-strfilter-use-__fallthrough.patch queue-4.9/perf-probe-fix-to-probe-on-gcc-generated-symbols-for-offline-kernel.patch