diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:50:49 -0400 |
| commit | 722f2a6c87f34ee0fd0130a8cf45f81e0705594a (patch) | |
| tree | 50b054df34d2731eb0ba0cf1a6c27e43e7eed428 /arch/h8300/kernel/module.c | |
| parent | 7a0aeb14e18ad59394bd9bbc6e57fb345819e748 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge commit 'linus/master' into HEAD
Conflicts:
MAINTAINERS
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
Diffstat (limited to 'arch/h8300/kernel/module.c')
| -rw-r--r-- | arch/h8300/kernel/module.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/h8300/kernel/module.c b/arch/h8300/kernel/module.c index cfc9127d2ced..0865e291c20d 100644 --- a/arch/h8300/kernel/module.c +++ b/arch/h8300/kernel/module.c | |||
| @@ -23,8 +23,6 @@ void *module_alloc(unsigned long size) | |||
| 23 | void module_free(struct module *mod, void *module_region) | 23 | void module_free(struct module *mod, void *module_region) |
| 24 | { | 24 | { |
| 25 | vfree(module_region); | 25 | vfree(module_region); |
| 26 | /* FIXME: If module_region == mod->init_region, trim exception | ||
| 27 | table entries. */ | ||
| 28 | } | 26 | } |
| 29 | 27 | ||
| 30 | /* We don't need anything special. */ | 28 | /* We don't need anything special. */ |