2021-03-24 14:39:47

by Wei Yongjun

Subject: [PATCH -next] x86/kprobes: Fix old-style-declaration warning

From: Wei Yongjun <[email protected]>

Gcc reports build warning as follows:



arch/x86/kernel/kprobes/core.c:940:1:

warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]

940 | static int nokprobe_inline kprobe_is_ss(struct kprobe_ctlblk *kcb)

| ^~~~~~



This commit fix it by moving nokprobe_inline to the beginning

of declaration.

Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wei Yongjun <[email protected]>
---
arch/x86/kernel/kprobes/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 89d9f26785c7..5abf251f12ec 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -937,7 +937,7 @@ static int reenter_kprobe(struct kprobe *p, struct pt_regs *regs,
}
NOKPROBE_SYMBOL(reenter_kprobe);

-static int nokprobe_inline kprobe_is_ss(struct kprobe_ctlblk *kcb)
+static nokprobe_inline int kprobe_is_ss(struct kprobe_ctlblk *kcb)
{
return (kcb->kprobe_status == KPROBE_HIT_SS ||
kcb->kprobe_status == KPROBE_REENTER);

2021-03-25 03:33:43

by Masami Hiramatsu

Subject: Re: [PATCH -next] x86/kprobes: Fix old-style-declaration warning

On Wed, 24 Mar 2021 14:45:02 +0000
'Wei Yongjun <[email protected]> wrote:

> From: Wei Yongjun <[email protected]>
>
> Gcc reports build warning as follows:
>
> arch/x86/kernel/kprobes/core.c:940:1:
> warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
> 940 | static int nokprobe_inline kprobe_is_ss(struct kprobe_ctlblk *kcb)
> | ^~~~~~
>
> This commit fix it by moving nokprobe_inline to the beginning
> of declaration.
>

Acked-by: Masami Hiramatsu <[email protected]>

Thank you!

> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Wei Yongjun <[email protected]>
> ---
> arch/x86/kernel/kprobes/core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
> index 89d9f26785c7..5abf251f12ec 100644
> --- a/arch/x86/kernel/kprobes/core.c
> +++ b/arch/x86/kernel/kprobes/core.c
> @@ -937,7 +937,7 @@ static int reenter_kprobe(struct kprobe *p, struct pt_regs *regs,
> }
> NOKPROBE_SYMBOL(reenter_kprobe);
>
> -static int nokprobe_inline kprobe_is_ss(struct kprobe_ctlblk *kcb)
> +static nokprobe_inline int kprobe_is_ss(struct kprobe_ctlblk *kcb)
> {
> return (kcb->kprobe_status == KPROBE_HIT_SS ||
> kcb->kprobe_status == KPROBE_REENTER);
>


--
Masami Hiramatsu <[email protected]>

2021-03-25 12:14:24

by tip-bot2 for Eric Biggers

Subject: [tip: x86/core] x86/kprobes: Move 'inline' to the beginning of the kprobe_is_ss() declaration

The following commit has been merged into the x86/core branch of tip:

Commit-ID: 2304d14db6595bea5292bece06c4c625b12d8f89
Gitweb: https://git.kernel.org/tip/2304d14db6595bea5292bece06c4c625b12d8f89
Author: Wei Yongjun <[email protected]>
AuthorDate: Wed, 24 Mar 2021 14:45:02
Committer: Ingo Molnar <[email protected]>
CommitterDate: Thu, 25 Mar 2021 13:07:58 +01:00

x86/kprobes: Move 'inline' to the beginning of the kprobe_is_ss() declaration

Address this GCC warning:

arch/x86/kernel/kprobes/core.c:940:1:
warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
940 | static int nokprobe_inline kprobe_is_ss(struct kprobe_ctlblk *kcb)
| ^~~~~~

[ mingo: Tidied up the changelog. ]

Fixes: 6256e668b7af: ("x86/kprobes: Use int3 instead of debug trap for single-step")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wei Yongjun <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Acked-by: Masami Hiramatsu <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
arch/x86/kernel/kprobes/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 922a6e2..dd09021 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -940,7 +940,7 @@ static int reenter_kprobe(struct kprobe *p, struct pt_regs *regs,
}
NOKPROBE_SYMBOL(reenter_kprobe);

-static int nokprobe_inline kprobe_is_ss(struct kprobe_ctlblk *kcb)
+static nokprobe_inline int kprobe_is_ss(struct kprobe_ctlblk *kcb)
{
return (kcb->kprobe_status == KPROBE_HIT_SS ||
kcb->kprobe_status == KPROBE_REENTER);