diff mbox series

[bpf-next] samples/bpf: hbm: Fix compile error about fallthrough marking

Message ID tencent_C11060D6C765B08AC1ABE2A801228381B206@qq.com (mailing list archive)
State Awaiting Upstream
Delegated to: BPF
Headers show
Series [bpf-next] samples/bpf: hbm: Fix compile error about fallthrough marking | expand

Checks

Context Check Description
bpf/vmtest-bpf-next-VM_Test-1 success Logs for ShellCheck
bpf/vmtest-bpf-next-VM_Test-6 success Logs for set-matrix
netdev/series_format success Single patches do not need cover letters
netdev/tree_selection success Clearly marked for bpf-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 8 this patch: 8
netdev/cc_maintainers success CCed 12 of 12 maintainers
netdev/build_clang success Errors and warnings before: 8 this patch: 8
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 8 this patch: 8
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-next-VM_Test-2 success Logs for build for aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-4 success Logs for build for x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-5 success Logs for build for x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-3 success Logs for build for s390x with gcc
bpf/vmtest-bpf-next-VM_Test-7 success Logs for test_maps on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-9 success Logs for test_maps on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-10 success Logs for test_maps on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-19 success Logs for test_progs_no_alu32_parallel on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-20 success Logs for test_progs_no_alu32_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-21 success Logs for test_progs_no_alu32_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-22 success Logs for test_progs_parallel on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-23 success Logs for test_progs_parallel on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-24 success Logs for test_progs_parallel on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-25 success Logs for test_verifier on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-27 success Logs for test_verifier on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-28 success Logs for test_verifier on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-29 success Logs for veristat
bpf/vmtest-bpf-next-VM_Test-11 success Logs for test_progs on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-13 success Logs for test_progs on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-14 success Logs for test_progs on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-15 success Logs for test_progs_no_alu32 on aarch64 with gcc
bpf/vmtest-bpf-next-VM_Test-17 success Logs for test_progs_no_alu32 on x86_64 with gcc
bpf/vmtest-bpf-next-VM_Test-18 success Logs for test_progs_no_alu32 on x86_64 with llvm-16
bpf/vmtest-bpf-next-VM_Test-26 success Logs for test_verifier on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-16 success Logs for test_progs_no_alu32 on s390x with gcc
bpf/vmtest-bpf-next-VM_Test-12 success Logs for test_progs on s390x with gcc
bpf/vmtest-bpf-next-PR success PR summary
bpf/vmtest-bpf-next-VM_Test-8 success Logs for test_maps on s390x with gcc

Commit Message

Rong Tao May 22, 2023, 3:20 a.m. UTC 
From: Rong Tao <rongtao@cestc.cn>

commit f7a858bffcdd("tools: Rename __fallthrough to fallthrough") rename
macro __fallthrough to fallthrough, commit 4b7ef71ac977("bpftool: Replace
"__fallthrough" by a comment to address merge conflict") use comments to
replace __fallthrough, here we can use fallthrough directly.

Compiling samples/bpf hits an error related to fallthrough marking:
    ...
    CC  samples/bpf/hbm.o
    linux/samples/bpf/hbm.c: In function ‘main’:
    linux/samples/bpf/hbm.c:501:25: error: ‘__fallthrough’ undeclared
    (first use in this function); did you mean ‘fallthrough’?
    501 |                         __fallthrough;
        |                         ^~~~~~~~~~~~~
        |                         fallthrough

Signed-off-by: Rong Tao <rongtao@cestc.cn>
---
 samples/bpf/hbm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Borkmann May 22, 2023, 8:47 a.m. UTC | #1 
On 5/22/23 5:20 AM, Rong Tao wrote:
> From: Rong Tao <rongtao@cestc.cn>
> 
> commit f7a858bffcdd("tools: Rename __fallthrough to fallthrough") rename
> macro __fallthrough to fallthrough, commit 4b7ef71ac977("bpftool: Replace
> "__fallthrough" by a comment to address merge conflict") use comments to
> replace __fallthrough, here we can use fallthrough directly.
> 
> Compiling samples/bpf hits an error related to fallthrough marking:
>      ...
>      CC  samples/bpf/hbm.o
>      linux/samples/bpf/hbm.c: In function ‘main’:
>      linux/samples/bpf/hbm.c:501:25: error: ‘__fallthrough’ undeclared
>      (first use in this function); did you mean ‘fallthrough’?
>      501 |                         __fallthrough;
>          |                         ^~~~~~~~~~~~~
>          |                         fallthrough
> 
> Signed-off-by: Rong Tao <rongtao@cestc.cn>
> ---
>   samples/bpf/hbm.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Fixed here already:

https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=a820ca1a739b7e3ee0ddb48bdfa3c09dc7cd4302
diff mbox series

Patch

diff --git a/samples/bpf/hbm.c b/samples/bpf/hbm.c
index 6448b7826107..7ddf25e9d098 100644
--- a/samples/bpf/hbm.c
+++ b/samples/bpf/hbm.c
@@ -498,7 +498,7 @@  int main(int argc, char **argv)
 					"Option -%c requires an argument.\n\n",
 					optopt);
 		case 'h':
-			__fallthrough;
+			fallthrough;
 		default:
 			Usage();
 			return 0;