Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74037
b: refs/heads/master
c: 9a4b970
h: refs/heads/master
i:
  74035: 5316a7c
v: v3
  • Loading branch information
Matti Linnanvuori authored and Rusty Russell committed Nov 19, 2007
1 parent ae1c418 commit 7a3bcfe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 74b2553f1d13e60fb27063204bd5b6908a6f8494
refs/heads/master: 9a4b9708f1f2eaf5edd619df578cf3afec36eb82
8 changes: 5 additions & 3 deletions trunk/kernel/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ int unregister_module_notifier(struct notifier_block * nb)
}
EXPORT_SYMBOL(unregister_module_notifier);

/* We require a truly strong try_module_get() */
/* We require a truly strong try_module_get(): 0 means failure due to
ongoing or failed initialization etc. */
static inline int strong_try_module_get(struct module *mod)
{
if (mod && mod->state == MODULE_STATE_COMING)
Expand Down Expand Up @@ -952,7 +953,8 @@ static unsigned long resolve_symbol(Elf_Shdr *sechdrs,
ret = __find_symbol(name, &owner, &crc,
!(mod->taints & TAINT_PROPRIETARY_MODULE));
if (ret) {
/* use_module can fail due to OOM, or module unloading */
/* use_module can fail due to OOM,
or module initialization or unloading */
if (!check_version(sechdrs, versindex, name, mod, crc) ||
!use_module(mod, owner))
ret = 0;
Expand Down Expand Up @@ -1369,7 +1371,7 @@ static int verify_export_symbols(struct module *mod)
return ret;
}

/* Change all symbols so that sh_value encodes the pointer directly. */
/* Change all symbols so that st_value encodes the pointer directly. */
static int simplify_symbols(Elf_Shdr *sechdrs,
unsigned int symindex,
const char *strtab,
Expand Down

0 comments on commit 7a3bcfe

Please sign in to comment.