diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /include/linux/module.h | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index f3b8329eb5b8..145a75528cc1 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -407,7 +407,6 @@ static inline local_t *__module_ref_addr(struct module *mod, int cpu) | |||
| 407 | static inline void __module_get(struct module *module) | 407 | static inline void __module_get(struct module *module) |
| 408 | { | 408 | { |
| 409 | if (module) { | 409 | if (module) { |
| 410 | BUG_ON(module_refcount(module) == 0); | ||
| 411 | local_inc(__module_ref_addr(module, get_cpu())); | 410 | local_inc(__module_ref_addr(module, get_cpu())); |
| 412 | put_cpu(); | 411 | put_cpu(); |
| 413 | } | 412 | } |