ARM: 5985/2: ARM: Fix Samsung build after "ARM: Eliminate decompressor -Dstatic=...
authorMark Brown <broonie@sirena.org.uk>
Wed, 10 Mar 2010 18:10:28 +0000 (19:10 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 13 Mar 2010 10:48:21 +0000 (10:48 +0000)
commita2302b45d8ab41a55e84c39a6c6f813586ad8493
tree8d1f78cea3a0af0a62c17b850773447ffd3254ec
parentdaf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c
ARM: 5985/2: ARM: Fix Samsung build after "ARM: Eliminate decompressor -Dstatic= PIC hack"

Commit 5de813b6 (ARM: Eliminate decompressor -Dstatic= PIC hack) among
other things changed the declared type of the error() function to an
extern, conflicting with the forward declartion in the Samsung
plat/uncompress.h which appears to have been relying on the static
being defined away, causing build failures since error() ends up with
a GOT relocation but the linker script discards all GOT relocated
data and functions:

arch/arm/boot/compressed/decompress.o: In function `gunzip':
/home/broonie/git/linux-2.6/arch/arm/boot/compressed/../../../../lib/decompress_
+inflate.c:68: undefined reference to `error'

and so on. Fix this by moving the declaration into uncompress/misc.c
where it is shared with the rest of the code, correcting the definition
as we go.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/boot/compressed/misc.c
arch/arm/plat-samsung/include/plat/uncompress.h