The patch titled elf-clean-up-fill_note_info-fix has been removed from the -mm tree. Its filename was elf-clean-up-fill_note_info-fix.patch This patch was dropped because it was folded into elf-clean-up-fill_note_info.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: elf-clean-up-fill_note_info-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Remove NUM_NOTES Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Amerigo Wang <amwang@xxxxxxxxxx> Cc: David Howells <dhowells@xxxxxxxxxx> Cc: Roland McGrath <roland@xxxxxxxxxx> Cc: WANG Cong <amwang@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/binfmt_elf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff -puN fs/binfmt_elf.c~elf-clean-up-fill_note_info-fix fs/binfmt_elf.c --- a/fs/binfmt_elf.c~elf-clean-up-fill_note_info-fix +++ a/fs/binfmt_elf.c @@ -1719,10 +1719,8 @@ static int elf_note_info_init(struct elf memset(info, 0, sizeof(*info)); INIT_LIST_HEAD(&info->thread_list); -#define NUM_NOTES 6 - info->notes = kmalloc(NUM_NOTES * sizeof(struct memelfnote), - GFP_KERNEL); -#undef NUM_NOTES + /* Allocate space for six ELF notes */ + info->notes = kmalloc(6 * sizeof(struct memelfnote), GFP_KERNEL); if (!info->notes) return 0; info->psinfo = kmalloc(sizeof(*info->psinfo), GFP_KERNEL); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch page-types-add-feature-for-walking-process-address-space.patch memcg-remove-the-overhead-associated-with-the-root-cgroup.patch memcg-add-comments-explaining-memory-barriers.patch memory-controller-soft-limit-reclaim-on-contention-v9.patch memcg-improve-resource-counter-scalability.patch exec-make-do_coredump-more-resilient-to-recursive-crashes-v9.patch exec-let-do_coredump-limit-the-number-of-concurrent-dumps-to-pipes-v9.patch elf-clean-up-fill_note_info.patch elf-clean-up-fill_note_info-fix.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