diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-26 13:53:41 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-26 13:53:41 +0100 |
| commit | 7533185eeefd087d5472422181ae8edf75118213 (patch) | |
| tree | 6a62ccb019668215f70bcc9876a795548f57262a /include/linux/moduleloader.h | |
| parent | b4b33f9d64c3edcdcbea874acdc1e9626fd961f1 (diff) | |
| parent | 0767e95bb96d7fdddcd590fb809e6975d93aebc5 (diff) | |
Merge branch 'for-linus' into for-next
Sync with the latest 3.19-rc state for applying other ALSA sequencer
core fixes.
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 |