summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/module.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-08 09:58:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-08 09:58:55 +0100
commit552dc340bce3b28f4af33c9134adafa5efacf1c9 (patch)
tree8ec5d6d4f7462e92baa0732aa2c47cc33a0b851c /arch/x86/kernel/module.c
parenta9fda02bfc91a281cd812ae15dabe6bfb9574f90 (diff)
parentee621dd619b9a85eced150fc06e352fef54cfda0 (diff)
Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'arch/x86/kernel/module.c')
-rw-r--r--arch/x86/kernel/module.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index e0bc186d7501..1c355c550960 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -239,11 +239,10 @@ int module_finalize(const Elf_Ehdr *hdr,
apply_paravirt(pseg, pseg + para->sh_size);
}
- 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);
}