summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorChristophe Leroy <christophe.leroy@c-s.fr>2016-03-15 14:07:49 +0100
committerMichael Ellerman <mpe@ellerman.id.au>2016-03-16 15:22:40 +1100
commit2e098dcee6208a690f73e11feb29d181cae7d978 (patch)
treec7862e6351b7ff8b7fcb3e310063b53cf45d0dfc /arch/powerpc
parentb081251ef6d6d7cf06448deeb3d9860b636358f5 (diff)
downloadop-kernel-dev-2e098dcee6208a690f73e11feb29d181cae7d978.zip
op-kernel-dev-2e098dcee6208a690f73e11feb29d181cae7d978.tar.gz
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 <christophe.leroy@c-s.fr> Cc: Scott Wood <oss@buserror.net> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/include/asm/reg_8xx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/reg_8xx.h b/arch/powerpc/include/asm/reg_8xx.h
index d41412c..94d01f8 100644
--- 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" : \
OpenPOWER on IntegriCloud