git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
module.c
diff --git
a/arch/i386/kernel/module.c
b/arch/i386/kernel/module.c
index
470cf97
..
2c6e3be
100644
(file)
--- a/
arch/i386/kernel/module.c
+++ b/
arch/i386/kernel/module.c
@@
-125,6
+125,7
@@
int module_finalize(const Elf_Ehdr *hdr,
void *aseg = (void *)alt->sh_addr;
apply_alternatives(aseg, aseg + alt->sh_size);
}
void *aseg = (void *)alt->sh_addr;
apply_alternatives(aseg, aseg + alt->sh_size);
}
+#ifdef CONFIG_SMP
if (locks && text) {
void *lseg = (void *)locks->sh_addr;
void *tseg = (void *)text->sh_addr;
if (locks && text) {
void *lseg = (void *)locks->sh_addr;
void *tseg = (void *)text->sh_addr;
@@
-132,10
+133,13
@@
int module_finalize(const Elf_Ehdr *hdr,
lseg, lseg + locks->sh_size,
tseg, tseg + text->sh_size);
}
lseg, lseg + locks->sh_size,
tseg, tseg + text->sh_size);
}
+#endif
return 0;
}
void module_arch_cleanup(struct module *mod)
{
return 0;
}
void module_arch_cleanup(struct module *mod)
{
+#ifdef CONFIG_SMP
alternatives_smp_module_del(mod);
alternatives_smp_module_del(mod);
+#endif
}
}