summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-03-15 15:29:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-03-15 15:29:22 +0100
commitb89ebadc3421f8ff85030768ec14144794984877 (patch)
treea26043c0e42bc059a4b7455c12bf4161817f9760
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 (diff)
downloadlinux-b89ebadc3421f8ff85030768ec14144794984877.tar.xz
linux-b89ebadc3421f8ff85030768ec14144794984877.zip
ARM: Add final piece to fix XIP decompressor in read-only memory
This defines STATIC_RW_DATA, which prevents the read/write malloc management data being declared with a static attribute. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/boot/compressed/decompress.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
index 0da382f33157..9c097073ce4c 100644
--- a/arch/arm/boot/compressed/decompress.c
+++ b/arch/arm/boot/compressed/decompress.c
@@ -11,6 +11,7 @@ extern unsigned long free_mem_end_ptr;
extern void error(char *);
#define STATIC static
+#define STATIC_RW_DATA /* non-static please */
#define ARCH_HAS_DECOMP_WDOG