diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-27 09:48:08 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-27 09:48:08 +1000 |
| commit | 22cbbceff65cb03ee37495b52f360809fa439293 (patch) | |
| tree | 59ee71a72328743242a2357b0a0af8697d1640e4 /arch/tile/kernel/module.c | |
| parent | 104b61590dcd5f71ff518e2b820e1cdf9d0350f2 (diff) | |
| parent | 26bc420b59a38e4e6685a73345a0def461136dce (diff) | |
Merge tag 'v3.19-rc6' into drm-fixes
Linux 3.19-rc6
pull in rc6 as the amdkfd fixes are based on it, and I'd rather
be doing the merges separately
Diffstat (limited to 'arch/tile/kernel/module.c')
| -rw-r--r-- | arch/tile/kernel/module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/kernel/module.c b/arch/tile/kernel/module.c index 96447c9160a0..2305084c9b93 100644 --- a/arch/tile/kernel/module.c +++ b/arch/tile/kernel/module.c @@ -74,7 +74,7 @@ error: /* Free memory returned from module_alloc */ -void module_free(struct module *mod, void *module_region) +void module_memfree(void *module_region) { vfree(module_region); @@ -83,7 +83,7 @@ void module_free(struct module *mod, void *module_region) 0, 0, 0, NULL, NULL, 0); /* - * FIXME: If module_region == mod->module_init, trim exception + * FIXME: Add module_arch_freeing_init to trim exception * table entries. */ } |