2018-12-18 21:06:35

by Mathieu Malaterre

[permalink] [raw]
Subject: [PATCH] powerpc/ptrace: fix empty-body warning

In commit a225f1567405 ("powerpc/ptrace: replace ptrace_report_syscall()
with a tracehook call") an empty body if(); was added.

Replace ; with {} to remove a warning (treated as error) reported by gcc
using W=1:

arch/powerpc/kernel/ptrace.c: In function ‘do_syscall_trace_enter’:
arch/powerpc/kernel/ptrace.c:3281:4: error: suggest braces around empty body in an ‘if’ statement [-Werror=empty-body]

Fixes: a225f1567405 ("powerpc/ptrace: replace ptrace_report_syscall() with a tracehook call")
Signed-off-by: Mathieu Malaterre <[email protected]>
---
arch/powerpc/kernel/ptrace.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 8314e8fed0ee..e1988892b3e7 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -3277,8 +3277,8 @@ long do_syscall_trace_enter(struct pt_regs *regs)
* avoid clobbering any register also, thus, not 'gotoing'
* skip label.
*/
- if (tracehook_report_syscall_entry(regs))
- ;
+ if (tracehook_report_syscall_entry(regs)) {
+ }
return -1;
}

--
2.19.2



2018-12-19 02:48:30

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc/ptrace: fix empty-body warning

Hi Mathieu,

Mathieu Malaterre <[email protected]> writes:
> In commit a225f1567405 ("powerpc/ptrace: replace ptrace_report_syscall()
> with a tracehook call") an empty body if(); was added.
>
> Replace ; with {} to remove a warning (treated as error) reported by gcc
> using W=1:
>
> arch/powerpc/kernel/ptrace.c: In function ‘do_syscall_trace_enter’:
> arch/powerpc/kernel/ptrace.c:3281:4: error: suggest braces around empty body in an ‘if’ statement [-Werror=empty-body]
>
> Fixes: a225f1567405 ("powerpc/ptrace: replace ptrace_report_syscall() with a tracehook call")
> Signed-off-by: Mathieu Malaterre <[email protected]>

Thanks for the fix, but this code is being refactored already in next,
see:

https://patchwork.ozlabs.org/patch/1014179/

cheers