aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/moduleloader.h
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-01-26 13:42:49 +0100
committerJoerg Roedel <jroedel@suse.de>2015-01-26 13:42:49 +0100
commitfd47b693c3c694da8210b5a0c01b1e379f4d9865 (patch)
tree84d8c5596df7f6eb295ac380b8ddb983af6c906d /include/linux/moduleloader.h
parentMerge branch 'iommu/next' of git://linuxtv.org/pinchartl/fbdev into arm/renesas (diff)
parentMerge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu (diff)
downloadlinux-dev-fd47b693c3c694da8210b5a0c01b1e379f4d9865.tar.xz
linux-dev-fd47b693c3c694da8210b5a0c01b1e379f4d9865.zip
Merge branch 'arm/smmu' into arm/renesas
Diffstat (limited to 'include/linux/moduleloader.h')
-rw-r--r--include/linux/moduleloader.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
index 7eeb9bbfb816..f7556261fe3c 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -26,7 +26,7 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
void *module_alloc(unsigned long size);
/* Free memory returned from module_alloc. */
-void module_free(struct module *mod, void *module_region);
+void module_memfree(void *module_region);
/*
* Apply the given relocation to the (simplified) ELF. Return -error
@@ -82,4 +82,6 @@ int module_finalize(const Elf_Ehdr *hdr,
/* Any cleanup needed when module leaves. */
void module_arch_cleanup(struct module *mod);
+/* Any cleanup before freeing mod->module_init */
+void module_arch_freeing_init(struct module *mod);
#endif