| Message ID | 1349448930-23976-3-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/10/12 00:55, Arnd Bergmann wrote: > 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> > Cc: Greg Ungerer <gerg@uclinux.org> > Cc: Russell King <rmk+kernel@arm.linux.org.uk> > Cc: Bryan Wu <bryan.wu@canonical.com> Acked-by: Greg Ungerer <gerg@uclinux.org> I can pick this one up to, and push to the arm-soc tree. Regards Greg > --- > arch/arm/include/asm/flat.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h > index 59426a4..e847d23 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 >
diff --git a/arch/arm/include/asm/flat.h b/arch/arm/include/asm/flat.h index 59426a4..e847d23 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
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> Cc: Greg Ungerer <gerg@uclinux.org> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Bryan Wu <bryan.wu@canonical.com> --- arch/arm/include/asm/flat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)