lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 618/879] module.h: simplify MODULE_IMPORT_NS
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    [ Upstream commit 80140a81f7f833998d732102eea0fea230b88067 ]

    In commit ca321ec74322 ("module.h: allow #define strings to work with
    MODULE_IMPORT_NS") I fixed up the MODULE_IMPORT_NS() macro to allow
    defined strings to work with it. Unfortunatly I did it in a two-stage
    process, when it could just be done with the __stringify() macro as
    pointed out by Masahiro Yamada.

    Clean this up to only be one macro instead of two steps to achieve the
    same end result.

    Fixes: ca321ec74322 ("module.h: allow #define strings to work with MODULE_IMPORT_NS")
    Reported-by: Masahiro Yamada <masahiroy@kernel.org>
    Cc: Luis Chamberlain <mcgrof@kernel.org>
    Cc: Jessica Yu <jeyu@kernel.org>
    Cc: Matthias Maennich <maennich@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    include/linux/module.h | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/include/linux/module.h b/include/linux/module.h
    index 1e135fd5c076..d5e9066990ca 100644
    --- a/include/linux/module.h
    +++ b/include/linux/module.h
    @@ -290,8 +290,7 @@ extern typeof(name) __mod_##type##__##name##_device_table \
    * files require multiple MODULE_FIRMWARE() specifiers */
    #define MODULE_FIRMWARE(_firmware) MODULE_INFO(firmware, _firmware)

    -#define _MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, #ns)
    -#define MODULE_IMPORT_NS(ns) _MODULE_IMPORT_NS(ns)
    +#define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, __stringify(ns))

    struct notifier_block;

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 04:50    [W:2.177 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site