History

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: module: use strstarts() strstarts: helper function for !strncmp(str, prefix, strlen(prefix)) arm: allow usage of string functions in linux/string.h module: don't use stop_machine on module load module: create a request_module_nowait() module: include other structures in module version check module: remove the SHF_ALLOC flag on the __versions section. module: clarify the force-loading taint message. module: Export symbols needed for Ksplice Ksplice: Add functions for walking kallsyms symbols module: remove module_text_address() module: __module_address module: Make find_symbol return a struct kernel_symbol kernel/module.c: fix an unused goto label param: fix charp parameters set via sysfs Fix trivial conflicts in kernel/extable.c manually.

Linus Torvalds committed 17 years ago

Commit cab4e4c2 parents 5412b53 495026713 files · +319 −137Browse files

Showing the changes to scripts (1 of 13 files). Show all

Unified · Split

scripts/mod/modpost.c+2−2
@@ -1607,12 +1607,12 @@ static void read_symbols(char *modname) · 1606 unmodified lines
1607 1607
1608 parse_elf_finish(&info);1608 parse_elf_finish(&info);
1609 1609
1610 /* Our trick to get versioning for struct_module - it's1610 /* Our trick to get versioning for module struct etc. - it's
1611 * never passed as an argument to an exported function, so1611 * never passed as an argument to an exported function, so
1612 * the automatic versioning doesn't pick it up, but it's really1612 * the automatic versioning doesn't pick it up, but it's really
1613 * important anyhow */1613 * important anyhow */
1614 if (modversions)1614 if (modversions)
1615 mod->unres = alloc_symbol("struct_module", 0, mod->unres);1615 mod->unres = alloc_symbol("module_layout", 0, mod->unres);
1616}1616}
1617 1617
1618#define SZ 5001618#define SZ 500