OSDN Git Service

powerpc/powermac: Mark variable x as unused
authorMathieu Malaterre <malat@debian.org>
Wed, 4 Apr 2018 20:07:46 +0000 (22:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Aug 2018 14:24:34 +0000 (16:24 +0200)
[ 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

index 76f5013..89237b8 100644 (file)
@@ -467,7 +467,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)
        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, unsigned long r4)
         * MMU switched OFF, so this should not be useful anymore.
         */
        if (bi->version < 4) {
+               unsigned long x __maybe_unused;
+
                bootx_printf("Touching pages...\n");
 
                /*