module: mark module_mutex static

Except for two lockdep asserts module_mutex is only used in module.c.
Remove the two asserts given that the functions they are in are not
exported and just called from the module code, and mark module_mutex
static.

Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jessica Yu <jeyu@kernel.org>

diff --git a/include/linux/module.h b/include/linux/module.h
index 3ea4ffae608f9763efca20aa49a0dd3884c6b207..0f360c48fe92a668d616c9be54f093cd92fa8349 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -550,8 +550,6 @@ static inline unsigned long kallsyms_symbol_value(const Elf_Sym *sym)
 }
 #endif
 
-extern struct mutex module_mutex;
-
 /* FIXME: It'd be nice to isolate modules during init, too, so they
    aren't used before they (may) fail.  But presently too much code
    (IDE & SCSI) require entry into the module during init.*/

diff --git a/kernel/module.c b/kernel/module.c
index 06155c454779b530824b82f24bb1a866aafa3d45..9befd793997eccf5f0ea37030843a613c90f2329 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -87,7 +87,7 @@
  * 3) module_addr_min/module_addr_max.
  * (delete and add uses RCU list operations).
  */
-DEFINE_MUTEX(module_mutex);
+static DEFINE_MUTEX(module_mutex);
 static LIST_HEAD(modules);
 
 /* Work queue for freeing init sections in success case */

diff --git a/lib/bug.c b/lib/bug.c
index 7103440c0ee1af84ccd732f131894836d628674a..8f9d537bfb2a59494a16b0a2dd1834618186c32e 100644 (file)
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -91,8 +91,6 @@ void module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
        char *secstrings;
        unsigned int i;
 
-       lockdep_assert_held(&module_mutex);
-
        mod->bug_table = NULL;
        mod->num_bugs = 0;
 
@@ -118,7 +116,6 @@ void module_bug_finalize(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs,
 
 void module_bug_cleanup(struct module *mod)
 {
-       lockdep_assert_held(&module_mutex);
        list_del_rcu(&mod->bug_list);
 }