summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-04-30 13:18:37 +0000
committerArnd Bergmann <arnd@arndb.de>2012-10-09 20:29:06 +0200
commitf6d5d8a5ed60c726354605877e8f8214fb11cc02 (patch)
treef404f51a0195de9a586a2746e420e64be6176c49 /arch
parentedc88ceb0c7d285b9f58bc29a638cd8163b59989 (diff)
downloadlinux-stable-f6d5d8a5ed60c726354605877e8f8214fb11cc02.tar.gz
linux-stable-f6d5d8a5ed60c726354605877e8f8214fb11cc02.tar.bz2
linux-stable-f6d5d8a5ed60c726354605877e8f8214fb11cc02.zip
ARM: binfmt_flat: unused variable 'persistent'
The flat_get_addr_from_rp() macro does not use the 'persistent' argument on ARM, causing a harmless compiler warning. A cast to void removes that warning. Without this patch, building at91x40_defconfig results in: fs/binfmt_flat.c: In function 'load_flat_file': fs/binfmt_flat.c:746:17: warning: unused variable 'persistent' [-Wunused-variable] Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Greg Ungerer <gerg@uclinux.org> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/flat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h
index 59426a4595c9..e847d23351ed 100644
--- a/arch/arm/include/asm/flat.h
+++ b/arch/arm/include/asm/flat.h
@@ -8,7 +8,7 @@
#define flat_argvp_envp_on_stack() 1
#define flat_old_ram_flag(flags) (flags)
#define flat_reloc_valid(reloc, size) ((reloc) <= (size))
-#define flat_get_addr_from_rp(rp, relval, flags, persistent) get_unaligned(rp)
+#define flat_get_addr_from_rp(rp, relval, flags, persistent) ((void)persistent,get_unaligned(rp))
#define flat_put_addr_at_rp(rp, val, relval) put_unaligned(val,rp)
#define flat_get_relocate_addr(rel) (rel)
#define flat_set_persistent(relval, p) 0