Merge branch 'akpm' (patches from Andrew)

[platform/kernel/linux-rpi.git] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index 824e26a..f8c7f26 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1847,7 +1847,7 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
        /*
         * Allocate a structure for each thread.
         */
-       for (ct = &dump_task->mm->core_state->dumper; ct; ct = ct->next) {
+       for (ct = &dump_task->signal->core_state->dumper; ct; ct = ct->next) {
                t = kzalloc(offsetof(struct elf_thread_core_info,
                                     notes[info->thread_notes]),
                            GFP_KERNEL);
@@ -2037,7 +2037,7 @@ static int fill_note_info(struct elfhdr *elf, int phdrs,
        if (!elf_note_info_init(info))
                return 0;
 
-       for (ct = current->mm->core_state->dumper.next;
+       for (ct = current->signal->core_state->dumper.next;
                                        ct; ct = ct->next) {
                ets = kzalloc(sizeof(*ets), GFP_KERNEL);
                if (!ets)