Merge tag 'io_uring-5.11-2020-12-23' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / fs / binfmt_elf.c

diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index fa50e89..950bc17 100644 (file)
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -1246,7 +1246,7 @@ out_free_interp:
        set_binfmt(&elf_format);
 
 #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES
-       retval = arch_setup_additional_pages(bprm, !!interpreter);
+       retval = ARCH_SETUP_ADDITIONAL_PAGES(bprm, elf_ex, !!interpreter);
        if (retval < 0)
                goto out;
 #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */
@@ -1307,7 +1307,7 @@ out_free_interp:
 #endif
 
        finalize_exec(bprm);
-       start_thread(regs, elf_entry, bprm->p);
+       START_THREAD(elf_ex, regs, elf_entry, bprm->p);
        retval = 0;
 out:
        return retval;
@@ -2198,6 +2198,7 @@ static int elf_core_dump(struct coredump_params *cprm)
        {
                size_t sz = get_note_info_size(&info);
 
+               /* For cell spufs */
                sz += elf_coredump_extra_notes_size();
 
                phdr4note = kmalloc(sizeof(*phdr4note), GFP_KERNEL);
@@ -2261,6 +2262,7 @@ static int elf_core_dump(struct coredump_params *cprm)
        if (!write_note_info(&info, cprm))
                goto end_coredump;
 
+       /* For cell spufs */
        if (elf_coredump_extra_notes_write(cprm))
                goto end_coredump;