diff options
| author | Dave Airlie <airlied@gmail.com> | 2015-01-29 02:45:31 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@gmail.com> | 2015-01-29 02:45:31 +0100 |
| commit | b3869b17fd63bacb53ac4db4ff4ba093701e17be (patch) | |
| tree | 073873d62957033f317bc413d9ea9fd5d5ff5a50 /arch/avr32/kernel | |
| parent | Merge tag 'drm/panel/for-3.20-rc1' of git://anongit.freedesktop.org/tegra/lin... (diff) | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | linux-b3869b17fd63bacb53ac4db4ff4ba093701e17be.tar.xz linux-b3869b17fd63bacb53ac4db4ff4ba093701e17be.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into drm-next
This backmerges drm-fixes into drm-next mainly for the amdkfd
stuff, I'm not 100% confident, but it builds and the amdkfd
folks can fix anything up.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Conflicts:
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
Diffstat (limited to 'arch/avr32/kernel')
| -rw-r--r-- | arch/avr32/kernel/module.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/avr32/kernel/module.c b/arch/avr32/kernel/module.c index 2c9412908024..164efa009e5b 100644 --- a/arch/avr32/kernel/module.c +++ b/arch/avr32/kernel/module.c @@ -19,12 +19,10 @@ #include <linux/moduleloader.h> #include <linux/vmalloc.h> -void module_free(struct module *mod, void *module_region) +void module_arch_freeing_init(struct module *mod) { vfree(mod->arch.syminfo); mod->arch.syminfo = NULL; - - vfree(module_region); } static inline int check_rela(Elf32_Rela *rela, struct module *module, @@ -291,12 +289,3 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab, return ret; } - -int module_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, - struct module *module) -{ - vfree(module->arch.syminfo); - module->arch.syminfo = NULL; - - return 0; -} |