| Message ID | 20171012153158.2840511-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 11e3e8d6d9274bf630859b4c47bc4e4d76f289db |
| Headers | show |
| Series | elf_fdpic: fix unused variable warning | expand |
On Thu, Oct 12, 2017 at 05:31:46PM +0200, Arnd Bergmann wrote: > The elf_fdpic code shows a harmless warning when built with MMU disabled, > I ran into this now that fdpic is available on ARM randconfig builds > since commit 50b2b2e691cd ("ARM: add ELF_FDPIC support"). > > 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: e6c1baa9b562 ("convert the rest of binfmt_elf_fdpic to dump_emit()") > Acked-by: Nicolas Pitre <nico@linaro.org> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Applied...
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;
The elf_fdpic code shows a harmless warning when built with MMU disabled, I ran into this now that fdpic is available on ARM randconfig builds since commit 50b2b2e691cd ("ARM: add ELF_FDPIC support"). 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: e6c1baa9b562 ("convert the rest of binfmt_elf_fdpic to dump_emit()") Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- v2: fixed changelog text --- fs/binfmt_elf_fdpic.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.9.0