Commit a01da1d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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."
parents 44d84afa 2e45e777

kernel/module.c

+0 −3
Original line number Diff line number Diff line
@@ -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,