Merge commit 'v2.6.36-rc7' into perf/core

[net-next-2.6.git] / arch / x86 / kernel / module.c

diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index 5399f58de7ed356098a8d408a9c4d0acc7809b30..8f295609173524cdf06a20c6c0ad4fbe1de12263 100644 (file)
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -242,11 +242,10 @@ int module_finalize(const Elf_Ehdr *hdr,
        /* make jump label nops */
        jump_label_apply_nops(me);
 
-       return module_bug_finalize(hdr, sechdrs, me);
+       return 0;
 }
 
 void module_arch_cleanup(struct module *mod)
 {
        alternatives_smp_module_del(mod);
-       module_bug_cleanup(mod);
 }