diff options
| author | Quentin Monnet <[email protected]> | 2023-04-20 01:33:33 +0100 |
|---|---|---|
| committer | Andrii Nakryiko <[email protected]> | 2023-04-20 16:38:10 -0700 |
| commit | 4b7ef71ac977899cf7bdb09d66052926c7d249ff (patch) | |
| tree | 799fcf35eab0dc9a49bb9400716a5d6d4a7676eb /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | 780c69830ec6b27e0224586ce26bc89552fcf163 (diff) | |
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 f7a858bffcdd ("tools: Rename __fallthrough to fallthrough")
Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
Reported-by: Sven Schnelle <[email protected]>
Reported-by: Thomas Richter <[email protected]>
Suggested-by: Daniel Borkmann <[email protected]>
Signed-off-by: Quentin Monnet <[email protected]>
Signed-off-by: Andrii Nakryiko <[email protected]>
Link: https://lore.kernel.org/all/[email protected]/
Link: https://lore.kernel.org/bpf/[email protected]/
Link: https://lore.kernel.org/bpf/[email protected]
Diffstat (limited to 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions