summaryrefslogtreecommitdiffstats
path: root/include/linux/moduleloader.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/moduleloader.h')
-rw-r--r--include/linux/moduleloader.h36
1 files changed, 4 insertions, 32 deletions
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
index 560ca53..b2be02e 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -28,49 +28,21 @@ void *module_alloc(unsigned long size);
/* Free memory returned from module_alloc. */
void module_free(struct module *mod, void *module_region);
-/*
- * Apply the given relocation to the (simplified) ELF. Return -error
- * or 0.
- */
-#ifdef CONFIG_MODULES_USE_ELF_REL
+/* Apply the given relocation to the (simplified) ELF. Return -error
+ or 0. */
int apply_relocate(Elf_Shdr *sechdrs,
const char *strtab,
unsigned int symindex,
unsigned int relsec,
struct module *mod);
-#else
-static inline int apply_relocate(Elf_Shdr *sechdrs,
- const char *strtab,
- unsigned int symindex,
- unsigned int relsec,
- struct module *me)
-{
- printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
- return -ENOEXEC;
-}
-#endif
-/*
- * Apply the given add relocation to the (simplified) ELF. Return
- * -error or 0
- */
-#ifdef CONFIG_MODULES_USE_ELF_RELA
+/* Apply the given add relocation to the (simplified) ELF. Return
+ -error or 0 */
int apply_relocate_add(Elf_Shdr *sechdrs,
const char *strtab,
unsigned int symindex,
unsigned int relsec,
struct module *mod);
-#else
-static inline int apply_relocate_add(Elf_Shdr *sechdrs,
- const char *strtab,
- unsigned int symindex,
- unsigned int relsec,
- struct module *me)
-{
- printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
- return -ENOEXEC;
-}
-#endif
/* Any final processing of module before access. Return -error or 0. */
int module_finalize(const Elf_Ehdr *hdr,