aboutsummaryrefslogtreecommitdiff
path: root/arch/s390/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-10-14 09:11:43 +0200
committerIngo Molnar <mingo@elte.hu>2010-10-14 09:11:46 +0200
commited859ed3b0f9893c6bce3708e8928341c15699b9 (patch)
tree59c507f00bc13becb4accdd64fdc01ece08b4645 /arch/s390/kernel
parenta8027073eb127cd207070891374b5c54c2ce3d23 (diff)
parent53eeb64e808971207350386121f4bab12fa2f45f (diff)
downloadlinux-linaro-android-ed859ed3b0f9893c6bce3708e8928341c15699b9.tar.gz
Merge branch 'linus' into sched/core
Merge reason: update from -rc5 to -almost-final Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r--arch/s390/kernel/module.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
index 22cfd634c35..f7167ee4604 100644
--- a/arch/s390/kernel/module.c
+++ b/arch/s390/kernel/module.c
@@ -407,10 +407,9 @@ int module_finalize(const Elf_Ehdr *hdr,
{
vfree(me->arch.syminfo);
me->arch.syminfo = NULL;
- return module_bug_finalize(hdr, sechdrs, me);
+ return 0;
}
void module_arch_cleanup(struct module *mod)
{
- module_bug_cleanup(mod);
}