aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 07:42:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-07 07:42:25 -0700
commita01da1d0f643142fa6845eb3bd14daab8ce7bea5 (patch)
tree51808763ac9f7e203d369584a45b61eece9bc2a4
parent44d84afa834b799560d7dbe47250ad7557f5ca2f (diff)
parent2e45e77787c9d0720b046eb69856edf43b17e33e (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param: Revert "module: remove the SHF_ALLOC flag on the __versions section."
-rw-r--r--kernel/module.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/module.c b/kernel/module.c
index c268a771595..05f014efa32 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1952,9 +1952,6 @@ static noinline struct module *load_module(void __user *umod,
if (strstarts(secstrings+sechdrs[i].sh_name, ".exit"))
sechdrs[i].sh_flags &= ~(unsigned long)SHF_ALLOC;
#endif
- /* Don't keep __versions around; it's just for loading. */
- if (strcmp(secstrings + sechdrs[i].sh_name, "__versions") == 0)
- sechdrs[i].sh_flags &= ~(unsigned long)SHF_ALLOC;
}
modindex = find_sec(hdr, sechdrs, secstrings,