The patch titled Subject: fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2-fix has been added to the -mm tree. Its filename is fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2-fix bah Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: Hector Marco Gisbert <hecmargi@xxxxxx> Cc: Hector Marco-Gisbert <hecmargi@xxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Ismael Ripoll <iripoll@xxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Will Deacon <will.deacon@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/binfmt_elf.c~fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2-fix fs/binfmt_elf.c --- a/fs/binfmt_elf.c~fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2-fix +++ a/fs/binfmt_elf.c @@ -2301,7 +2301,7 @@ out: #endif /* CONFIG_ELF_CORE */ -#ifdef ARCH_HAVE_ELF_ASLR +#ifdef CONFIG_ARCH_HAVE_ELF_ASLR unsigned long randomize_et_dyn(unsigned long base) { unsigned long ret; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arch-alpha-kernel-systblss-remove-debug-check.patch i-need-old-gcc.patch kernel-sysc-fix-uname26-for-40-fix.patch mm.patch mm-cma-release-trigger-checkpatch-fixes.patch mm-cma-allocation-trigger-fix.patch mm-compaction-enhance-compaction-finish-condition-fix.patch page_writeback-cleanup-mess-around-cancel_dirty_page-checkpatch-fixes.patch mm-hide-per-cpu-lists-in-output-of-show_mem-fix.patch mm-vmscan-fix-the-page-state-calculation-in-too_many_isolated.patch x86-add-pmd_-for-thp-fix.patch sparc-add-pmd_-for-thp-fix.patch mips-rename-brk_rnd-to-mmap_rnd.patch fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix.patch fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix.patch fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2.patch fix-offset2lib-issue-for-x86-arm-powerpc-and-mips-fix-fix-2-fix.patch kernel-conditionally-support-non-root-users-groups-and-capabilities-checkpatch-fixes.patch lib-find__bit-reimplementation-fix.patch binfmt_misc-simplify-entry_status-fix.patch fs-fat-remove-unnecessary-includes-fix.patch kconfig-use-macros-which-are-already-defined-fix.patch linux-next.patch linux-next-rejects.patch lib-kconfig-fix-up-have_arch_bitreverse-help-text.patch do_shared_fault-check-that-mmap_sem-is-held.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html