1 files changed, 6 insertions, 6 deletions

diff --git a/arch/avr32/kernel/module.c b/arch/avr32/kernel/module.c
index 164efa009e5b..2b4c54c04cb6 100644
--- a/arch/avr32/kernel/module.c
+++ b/arch/avr32/kernel/module.c
@@ -118,9 +118,9 @@ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
          * Increase core size to make room for GOT and set start
          * offset for GOT.
          */
-        module->core_size = ALIGN(module->core_size, 4);
-        module->arch.got_offset = module->core_size;
-        module->core_size += module->arch.got_size;
+        module->core_layout.size = ALIGN(module->core_layout.size, 4);
+        module->arch.got_offset = module->core_layout.size;
+        module->core_layout.size += module->arch.got_size;
 
         return 0;
 
@@ -177,7 +177,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                         if (!info->got_initialized) {
                                 Elf32_Addr *gotent;
 
-                                gotent = (module->module_core
+                                gotent = (module->core_layout.base
                                           + module->arch.got_offset
                                           + info->got_offset);
                                 *gotent = relocation;
@@ -255,8 +255,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,
                          */
                         pr_debug("GOTPC: PC=0x%x, got_offset=0x%lx, core=0x%p\n",
                                  relocation, module->arch.got_offset,
-                                 module->module_core);
-                        relocation -= ((unsigned long)module->module_core
+                                 module->core_layout.base);
+                        relocation -= ((unsigned long)module->core_layout.base
                                        + module->arch.got_offset);
                         *location = relocation;
                         break;