Merge tag 'mips_6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[thirdparty/linux.git] / arch / mips / kernel / vpe.c

diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 343d2597ed76754e98e3698d1ccbeaf7ea22ee82..e9a0cfd02ae202f0679445d1191964d2633681b2 100644 (file)
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -199,18 +199,17 @@ static void layout_sections(struct module *mod, const Elf_Ehdr *hdr,
        for (m = 0; m < ARRAY_SIZE(masks); ++m) {
                for (i = 0; i < hdr->e_shnum; ++i) {
                        Elf_Shdr *s = &sechdrs[i];
+                       struct module_memory *mod_mem;
+
+                       mod_mem = &mod->mem[MOD_TEXT];
 
                        if ((s->sh_flags & masks[m][0]) != masks[m][0]
                            || (s->sh_flags & masks[m][1])
                            || s->sh_entsize != ~0UL)
                                continue;
                        s->sh_entsize =
-                               get_offset((unsigned long *)&mod->core_layout.size, s);
+                               get_offset((unsigned long *)&mod_mem->size, s);
                }
-
-               if (m == 0)
-                       mod->core_layout.text_size = mod->core_layout.size;
-
        }
 }
 
@@ -641,7 +640,7 @@ static int vpe_elfload(struct vpe *v)
                layout_sections(&mod, hdr, sechdrs, secstrings);
        }
 
-       v->load_addr = alloc_progmem(mod.core_layout.size);
+       v->load_addr = alloc_progmem(mod.mem[MOD_TEXT].size);
        if (!v->load_addr)
                return -ENOMEM;