| From 5f6049cbf724134b95be4896e419812409f3b8bd Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 4 Aug 2020 10:54:05 +1000 |
| Subject: powerpc/powernv/smp: Fix spurious DBG() warning |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Oliver O'Halloran <oohall@gmail.com> |
| |
| [ Upstream commit f6bac19cf65c5be21d14a0c9684c8f560f2096dd ] |
| |
| When building with W=1 we get the following warning: |
| |
| arch/powerpc/platforms/powernv/smp.c: In function ‘pnv_smp_cpu_kill_self’: |
| arch/powerpc/platforms/powernv/smp.c:276:16: error: suggest braces around |
| empty body in an ‘if’ statement [-Werror=empty-body] |
| 276 | cpu, srr1); |
| | ^ |
| cc1: all warnings being treated as errors |
| |
| The full context is this block: |
| |
| if (srr1 && !generic_check_cpu_restart(cpu)) |
| DBG("CPU%d Unexpected exit while offline srr1=%lx!\n", |
| cpu, srr1); |
| |
| When building with DEBUG undefined DBG() expands to nothing and GCC emits |
| the warning due to the lack of braces around an empty statement. |
| |
| Signed-off-by: Oliver O'Halloran <oohall@gmail.com> |
| Reviewed-by: Joel Stanley <joel@jms.id.au> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/20200804005410.146094-2-oohall@gmail.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/platforms/powernv/smp.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c |
| index b2ba3e95bda73..bbf361f23ae86 100644 |
| --- a/arch/powerpc/platforms/powernv/smp.c |
| +++ b/arch/powerpc/platforms/powernv/smp.c |
| @@ -43,7 +43,7 @@ |
| #include <asm/udbg.h> |
| #define DBG(fmt...) udbg_printf(fmt) |
| #else |
| -#define DBG(fmt...) |
| +#define DBG(fmt...) do { } while (0) |
| #endif |
| |
| static void pnv_smp_setup_cpu(int cpu) |
| -- |
| 2.27.0 |
| |
