ARM: 5882/1: ARM: Fix uncompress code compile for different defines of flush(void)
authorTony Lindgren <tony@atomide.com>
Thu, 14 Jan 2010 19:36:55 +0000 (20:36 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 18 Jan 2010 12:44:51 +0000 (12:44 +0000)
commitb53e9b5ebd5c6e718f54bcacd4e97b71533ca681
tree055a09686eefa24a4bc72be7c25847c690f34c7d
parent95b8f20fd6a2694a16b8addb190b942bfb670c88
ARM: 5882/1: ARM: Fix uncompress code compile for different defines of flush(void)

Because of the include of the decompress_inflate.c file from
boot/compress/misc.c, there are different flush() defines:

In file included from arch/arm/boot/compressed/misc.c:249:
arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:138:29: error: macro "flush" passed 2 arguments, but takes just 0

Fix this by removing the define of flush() in misc.c for
CONFIG_DEBUG_ICEDCC as it's already defined in mach/uncompress.h,
and that is being included unconditionally.

Also use a static inline function instead of define
for mach-mxc and mach-gemini to avoid similar bug
for those platforms.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/boot/compressed/misc.c
arch/arm/mach-gemini/include/mach/uncompress.h
arch/arm/plat-mxc/include/mach/uncompress.h