| From foo@baz Sat Jul 28 12:10:33 CEST 2018 |
| From: Mathieu Malaterre <malat@debian.org> |
| Date: Wed, 4 Apr 2018 22:07:46 +0200 |
| Subject: powerpc/powermac: Mark variable x as unused |
| |
| From: Mathieu Malaterre <malat@debian.org> |
| |
| [ Upstream commit 5a4b475cf8511da721f20ba432c244061db7139f ] |
| |
| Since the value of x is never intended to be read, declare it with gcc |
| attribute as unused. Fix warning treated as error with W=1: |
| |
| arch/powerpc/platforms/powermac/bootx_init.c:471:21: error: variable ‘x’ set but not used [-Werror=unused-but-set-variable] |
| |
| Suggested-by: Christophe Leroy <christophe.leroy@c-s.fr> |
| Signed-off-by: Mathieu Malaterre <malat@debian.org> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/powerpc/platforms/powermac/bootx_init.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/arch/powerpc/platforms/powermac/bootx_init.c |
| +++ b/arch/powerpc/platforms/powermac/bootx_init.c |
| @@ -467,7 +467,7 @@ void __init bootx_init(unsigned long r3, |
| boot_infos_t *bi = (boot_infos_t *) r4; |
| unsigned long hdr; |
| unsigned long space; |
| - unsigned long ptr, x; |
| + unsigned long ptr; |
| char *model; |
| unsigned long offset = reloc_offset(); |
| |
| @@ -561,6 +561,8 @@ void __init bootx_init(unsigned long r3, |
| * MMU switched OFF, so this should not be useful anymore. |
| */ |
| if (bi->version < 4) { |
| + unsigned long x __maybe_unused; |
| + |
| bootx_printf("Touching pages...\n"); |
| |
| /* |
