powerpc/8xx: Fix do_mtspr_cpu6() build on older compilers

GCC < 4.9 is unable to build this, saying:

  arch/powerpc/mm/8xx_mmu.c:139:2: error: memory input 1 is not directly addressable

Change the one-element array into a simple variable to avoid this.

Fixes: 1458dd951f7c ("powerpc/8xx: Handle CPU6 ERRATA directly in mtspr() macro")
Signed-off-by: Christophe Leroy <[email protected]>
Cc: Scott Wood <[email protected]>
Signed-off-by: Michael Ellerman <[email protected]>

diff --git a/arch/powerpc/include/asm/reg_8xx.h b/arch/powerpc/include/asm/reg_8xx.h
index d41412c7748bc15d46e1b236624e512a6b1b18b8..94d01f81e66877646faba091187ae981bfa0a457 100644 (file)
--- a/arch/powerpc/include/asm/reg_8xx.h
+++ b/arch/powerpc/include/asm/reg_8xx.h
@@ -53,7 +53,7 @@
 #ifdef CONFIG_8xx_CPU6
 #define do_mtspr_cpu6(rn, rn_addr, v)  \
        do {                                                            \
-               int _reg_cpu6 = rn_addr, _tmp_cpu6[1];          \
+               int _reg_cpu6 = rn_addr, _tmp_cpu6;             \
                asm volatile("stw %0, %1;"                              \
                             "lwz %0, %1;"                              \
                             "mtspr " __stringify(rn) ",%2" :           \