diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-03 12:22:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-03 12:22:18 +0100 |
| commit | 8dbcb8737cdd564dd58156b890e567595d8a778d (patch) | |
| tree | 7768af62c42fd167b95d7b0cf461aab37d61497e /include/linux/moduleloader.h | |
| parent | 772a9aca12567badb5b9caf2af249a5991f47ea8 (diff) | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
| download | cachepc-linux-8dbcb8737cdd564dd58156b890e567595d8a778d.tar.gz cachepc-linux-8dbcb8737cdd564dd58156b890e567595d8a778d.zip | |
Merge tag 'v3.19-rc7' into x86/asm, to refresh the branch before pulling in new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/moduleloader.h')
| -rw-r--r-- | include/linux/moduleloader.h | 4 |
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 |