diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 08:41:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 08:41:02 -0800 |
| commit | 178cf7de6f1d3b95407f5a76af249fc924d42576 (patch) | |
| tree | 4b3e5f3ef6dfa7866fb30811acdc60832a055269 /include/linux/moduleloader.h | |
| parent | Merge tag 'iio-for-3.20b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-testing (diff) | |
| parent | Linux 3.19-rc7 (diff) | |
| download | wireguard-linux-178cf7de6f1d3b95407f5a76af249fc924d42576.tar.xz wireguard-linux-178cf7de6f1d3b95407f5a76af249fc924d42576.zip | |
Merge 3.19-rc7 into staging-next
We want those fixes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 |