The following commit has been merged in the linux branch: commit cf50f447b22f540d738eb8ca09c3b3972a9ba0ac Author: Anton Vorontsov avorontsov@ru.mvista.com Date: Thu Oct 1 08:38:49 2009 +0000

powerpc/kgdb: Fix build failure caused by "kgdb.c: unused variable 'acc'"

'acc' isn't used anywhere and thus triggers gcc warning, which causes build error with CONFIG_PPC_DISABLE_WERROR=n (default):

cc1: warnings being treated as errors arch/powerpc/kernel/kgdb.c: In function 'gdb_regs_to_pt_regs': arch/powerpc/kernel/kgdb.c:289: warning: unused variable 'acc' make[1]: *** [arch/powerpc/kernel/kgdb.o] Error 1

Signed-off-by: Anton Vorontsov avorontsov@ru.mvista.com Signed-off-by: Benjamin Herrenschmidt benh@kernel.crashing.org

diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c index fe8f71d..641c74b 100644 --- a/arch/powerpc/kernel/kgdb.c +++ b/arch/powerpc/kernel/kgdb.c @@ -282,12 +282,6 @@ void gdb_regs_to_pt_regs(unsigned long *gdb_regs, struct pt_regs *regs) { unsigned long *ptr = gdb_regs; int reg; -#ifdef CONFIG_SPE - union { - u32 v32[2]; - u64 v64; - } acc; -#endif

for (reg = 0; reg < 32; reg++) UNPACK64(regs->gpr[reg], ptr);