lkml.org 
[lkml]   [2021]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/13] module: mark module_mutex static
    Date
    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.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    include/linux/module.h | 2 --
    kernel/module.c | 2 +-
    lib/bug.c | 3 ---
    3 files changed, 1 insertion(+), 6 deletions(-)

    diff --git a/include/linux/module.h b/include/linux/module.h
    index 3ea4ffae608f97..0f360c48fe92a6 100644
    --- 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 856df9e17ff3d0..5152fae1fc9406 100644
    --- 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 7103440c0ee1af..8f9d537bfb2a59 100644
    --- 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);
    }

    --
    2.29.2
    \
     
     \ /
      Last update: 2021-01-28 19:23    [W:8.584 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site