2023-05-22 03:40:46

by Rong Tao

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

From: Rong Tao <[email protected]>

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 <[email protected]>
---
samples/bpf/hbm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

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;
--
2.39.1

2023-05-22 09:12:12

by Daniel Borkmann

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

On 5/22/23 5:20 AM, Rong Tao wrote:
> From: Rong Tao <[email protected]>
>
> 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 <[email protected]>
> ---
> 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