[PATCH] elf_fdpic: fix unused variable warning

From: Arnd Bergmann
Date: Thu Oct 12 2017 - 05:47:16 EST


The elf_fdpic code shows a harmless warning when built with MMU
enabled, I ran into this now that the configuration is possible
on ARM randconfig builds:

fs/binfmt_elf_fdpic.c: In function 'elf_fdpic_dump_segments':
fs/binfmt_elf_fdpic.c:1501:17: error: unused variable 'addr' [-Werror=unused-variable]

This adds another #ifdef around the variable declaration to shut
up the warning.

Fixes: 382e67aec6a7 ("ARM: enable elf_fdpic on systems with an MMU")
Fixes: e6c1baa9b562 ("convert the rest of binfmt_elf_fdpic to dump_emit()")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
---
Who should pick this up? I guess it could go through either the
ARM tree that introduced the warning for ARM and contains a number
of fdpic patches, or it could go through the VFS tree.
---
fs/binfmt_elf_fdpic.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 5429b035e249..429326b6e2e7 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -1498,7 +1498,9 @@ static bool elf_fdpic_dump_segments(struct coredump_params *cprm)
struct vm_area_struct *vma;

for (vma = current->mm->mmap; vma; vma = vma->vm_next) {
+#ifdef CONFIG_MMU
unsigned long addr;
+#endif

if (!maydump(vma, cprm->mm_flags))
continue;
--
2.9.0