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."
This commit is contained in:
commit
a01da1d0f6
|
@ -1952,9 +1952,6 @@ static noinline struct module *load_module(void __user *umod,
|
||||||
if (strstarts(secstrings+sechdrs[i].sh_name, ".exit"))
|
if (strstarts(secstrings+sechdrs[i].sh_name, ".exit"))
|
||||||
sechdrs[i].sh_flags &= ~(unsigned long)SHF_ALLOC;
|
sechdrs[i].sh_flags &= ~(unsigned long)SHF_ALLOC;
|
||||||
#endif
|
#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,
|
modindex = find_sec(hdr, sechdrs, secstrings,
|
||||||
|
|
Loading…
Reference in New Issue