3.16.54-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Arnd Bergmann <[email protected]> commit 11e3e8d6d9274bf630859b4c47bc4e4d76f289db upstream. 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 <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Al Viro <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- fs/binfmt_elf_fdpic.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -1487,7 +1487,9 @@ static bool elf_fdpic_dump_segments(stru 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;
