Commit 4b7ef71a authored by Quentin Monnet's avatar Quentin Monnet Committed by Andrii Nakryiko

bpftool: Replace "__fallthrough" by a comment to address merge conflict

The recent support for inline annotations in control flow graphs
generated by bpftool introduced the usage of the "__fallthrough" macro
in a switch/case block in btf_dumper.c. This change went through the
bpf-next tree, but resulted in a merge conflict in linux-next, because
this macro has been renamed "fallthrough" (no underscores) in the
meantime.

To address the conflict, we temporarily switch to a simple comment
instead of a macro.

Related: commit f7a858bf ("tools: Rename __fallthrough to fallthrough")

Fixes: 9fd49684 ("bpftool: Support inline annotations when dumping the CFG of a program")
Reported-by: default avatarSven Schnelle <svens@linux.ibm.com>
Reported-by: default avatarThomas Richter <tmricht@linux.ibm.com>
Suggested-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarQuentin Monnet <quentin@isovalent.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/all/yt9dttxlwal7.fsf@linux.ibm.com/
Link: https://lore.kernel.org/bpf/20230412123636.2358949-1-tmricht@linux.ibm.com/
Link: https://lore.kernel.org/bpf/20230420003333.90901-1-quentin@isovalent.com
parent 780c6983
...@@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s) ...@@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s)
case '|': case '|':
case ' ': case ' ':
putchar('\\'); putchar('\\');
__fallthrough; /* fallthrough */
default: default:
putchar(*s); putchar(*s);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment