1 files changed, 16 insertions, 16 deletions

diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
index 3c63a820fcda..b9d75d9fa9ac 100644
--- a/arch/parisc/kernel/module.c
+++ b/arch/parisc/kernel/module.c
@@ -42,9 +42,9 @@
  *      We are not doing SEGREL32 handling correctly. According to the ABI, we
  *      should do a value offset, like this:
  *                      if (in_init(me, (void *)val))
- *                              val -= (uint32_t)me->module_init;
+ *                              val -= (uint32_t)me->init_layout.base;
  *                      else
- *                              val -= (uint32_t)me->module_core;
+ *                              val -= (uint32_t)me->core_layout.base;
  *      However, SEGREL32 is used only for PARISC unwind entries, and we want
  *      those entries to have an absolute address, and not just an offset.
  *
@@ -100,14 +100,14 @@
  * or init pieces the location is */
 static inline int in_init(struct module *me, void *loc)
 {
-        return (loc >= me->module_init &&
-                loc <= (me->module_init + me->init_size));
+        return (loc >= me->init_layout.base &&
+                loc <= (me->init_layout.base + me->init_layout.size));
 }
 
 static inline int in_core(struct module *me, void *loc)
 {
-        return (loc >= me->module_core &&
-                loc <= (me->module_core + me->core_size));
+        return (loc >= me->core_layout.base &&
+                loc <= (me->core_layout.base + me->core_layout.size));
 }
 
 static inline int in_local(struct module *me, void *loc)
@@ -367,13 +367,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
         }
 
         /* align things a bit */
-        me->core_size = ALIGN(me->core_size, 16);
-        me->arch.got_offset = me->core_size;
-        me->core_size += gots * sizeof(struct got_entry);
+        me->core_layout.size = ALIGN(me->core_layout.size, 16);
+        me->arch.got_offset = me->core_layout.size;
+        me->core_layout.size += gots * sizeof(struct got_entry);
 
-        me->core_size = ALIGN(me->core_size, 16);
-        me->arch.fdesc_offset = me->core_size;
-        me->core_size += fdescs * sizeof(Elf_Fdesc);
+        me->core_layout.size = ALIGN(me->core_layout.size, 16);
+        me->arch.fdesc_offset = me->core_layout.size;
+        me->core_layout.size += fdescs * sizeof(Elf_Fdesc);
 
         me->arch.got_max = gots;
         me->arch.fdesc_max = fdescs;
@@ -391,7 +391,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
 
         BUG_ON(value == 0);
 
-        got = me->module_core + me->arch.got_offset;
+        got = me->core_layout.base + me->arch.got_offset;
         for (i = 0; got[i].addr; i++)
                 if (got[i].addr == value)
                         goto out;
@@ -409,7 +409,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
 #ifdef CONFIG_64BIT
 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
 {
-        Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
+        Elf_Fdesc *fdesc = me->core_layout.base + me->arch.fdesc_offset;
 
         if (!value) {
                 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
@@ -427,7 +427,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
 
         /* Create new one */
         fdesc->addr = value;
-        fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
+        fdesc->gp = (Elf_Addr)me->core_layout.base + me->arch.got_offset;
         return (Elf_Addr)fdesc;
 }
 #endif /* CONFIG_64BIT */
@@ -839,7 +839,7 @@ register_unwind_table(struct module *me,
 
         table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
         end = table + sechdrs[me->arch.unwind_section].sh_size;
-        gp = (Elf_Addr)me->module_core + me->arch.got_offset;
+        gp = (Elf_Addr)me->core_layout.base + me->arch.got_offset;
 
         DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
                me->arch.unwind_section, table, end, gp);