aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2008-12-31 12:31:18 +0100
committerRusty Russell <rusty@rustcorp.com.au>2009-01-05 08:40:13 +1030
commit088af9a6e05d51e7c3dc85d45d8b7a52c3ee08d7 (patch)
tree86e2dd6be7fbc17cb01a42fc11f5eef794a824df /kernel
parentd1e99d7ae4e6bbd1ebb5e81ecd3af2b8793efee0 (diff)
downloadmrst-s0i3-test-088af9a6e05d51e7c3dc85d45d8b7a52c3ee08d7.tar.gz
mrst-s0i3-test-088af9a6e05d51e7c3dc85d45d8b7a52c3ee08d7.tar.xz
mrst-s0i3-test-088af9a6e05d51e7c3dc85d45d8b7a52c3ee08d7.zip
module: fix module loading failure of large kernel modules for parisc
When creating the final layout of a kernel module in memory, allow the module loader to reserve some additional memory in front of a given section. This is currently only needed for the parisc port which needs to put the stub entries there to fulfill the 17/22bit PCREL relocations with large kernel modules like xfs. Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (renamed fn)
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c
index d3d254571bd..4299aefc20b 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1578,11 +1578,21 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
return ret;
}
+/* Additional bytes needed by arch in front of individual sections */
+unsigned int __weak arch_mod_section_prepend(struct module *mod,
+ unsigned int section)
+{
+ /* default implementation just returns zero */
+ return 0;
+}
+
/* Update size with this section: return offset. */
-static long get_offset(unsigned int *size, Elf_Shdr *sechdr)
+static long get_offset(struct module *mod, unsigned int *size,
+ Elf_Shdr *sechdr, unsigned int section)
{
long ret;
+ *size += arch_mod_section_prepend(mod, section);
ret = ALIGN(*size, sechdr->sh_addralign ?: 1);
*size = ret + sechdr->sh_size;
return ret;
@@ -1622,7 +1632,7 @@ static void layout_sections(struct module *mod,
|| strncmp(secstrings + s->sh_name,
".init", 5) == 0)
continue;
- s->sh_entsize = get_offset(&mod->core_size, s);
+ s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
DEBUGP("\t%s\n", secstrings + s->sh_name);
}
if (m == 0)
@@ -1640,7 +1650,7 @@ static void layout_sections(struct module *mod,
|| strncmp(secstrings + s->sh_name,
".init", 5) != 0)
continue;
- s->sh_entsize = (get_offset(&mod->init_size, s)
+ s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
| INIT_OFFSET_MASK);
DEBUGP("\t%s\n", secstrings + s->sh_name);
}