[ARM] Fix params_phys with PIC decompressor builds.

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 69371402443048714e0cc69f15c331b75991bb11..3af3a55d823d8512ef277a6e1d6a5bd009795195 100644 (file)
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -349,6 +349,12 @@ LC0:               .word   LC0                     @ r1
 LC1:           .word   reloc_end - reloc_start
                .size   LC0, . - LC0
 
+               .globl  params
+params:                ldr     r0, =params_phys
+               mov     pc, lr
+               .ltorg
+               .align
+
 /*
  * Turn on the cache.  We need to setup some page tables so that we
  * can have both the I and D caches on.

diff --git a/include/asm-arm/arch-rpc/uncompress.h b/include/asm-arm/arch-rpc/uncompress.h
index 855e8790d1c4ce36aa4c7be46d0ef8b5cc206e09..43035fec64d21eef7ad94f0ba821db99e342468f 100644 (file)
--- a/include/asm-arm/arch-rpc/uncompress.h
+++ b/include/asm-arm/arch-rpc/uncompress.h
@@ -60,8 +60,8 @@ static const unsigned long palette_4[16] = {
  * params_phys is a linker defined symbol - see
  * arch/arm/boot/compressed/Makefile
  */
-extern struct param_struct params_phys;
-#define params (&params_phys)
+extern __attribute__((pure)) struct param_struct *params(void);
+#define params (params())
 
 #ifndef STANDALONE_DEBUG 
 /*