Skip to content
Commit 1215c1cc authored by Tony Lindgren's avatar Tony Lindgren Committed by Stefan Bader
Browse files

ARM: 5882/1: ARM: Fix uncompress code compile for different defines of flush(void)

BugLink: http://bugs.launchpad.net/bugs/319240
    commit b53e9b5e

 upstream

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.

(bryan.wu@canonical.com: back ported it to 2.6.31 for fsl-imx51)

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarBryan Wu <bryan.wu@canonical.com>
parent 41ab4138
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment