diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
| commit | 26e20a108caca6231c6a5ec659f815a866904751 (patch) | |
| tree | 36932c208a9e8994bfd7ed4eaf48b9c33f71fbe3 /include/linux/module.h | |
| parent | 691513f70d3957939a318da970987b876c720861 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into x86/security
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index ddaa689d71bd..8b17fd8c790d 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -520,7 +520,7 @@ static inline void __module_get(struct module *module) | |||
| 520 | #define symbol_put_addr(p) do { } while(0) | 520 | #define symbol_put_addr(p) do { } while(0) |
| 521 | 521 | ||
| 522 | #endif /* CONFIG_MODULE_UNLOAD */ | 522 | #endif /* CONFIG_MODULE_UNLOAD */ |
| 523 | int use_module(struct module *a, struct module *b); | 523 | int ref_module(struct module *a, struct module *b); |
| 524 | 524 | ||
| 525 | /* This is a #define so the string doesn't get put in every .o file */ | 525 | /* This is a #define so the string doesn't get put in every .o file */ |
| 526 | #define module_name(mod) \ | 526 | #define module_name(mod) \ |