module.h: allow #define strings to work with MODULE_IMPORT_NS
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 8 Jan 2022 14:06:57 +0000 (15:06 +0100)
committerLuis Chamberlain <mcgrof@kernel.org>
Wed, 12 Jan 2022 03:11:09 +0000 (19:11 -0800)
The MODULE_IMPORT_NS() macro does not allow defined strings to work
properly with it, so add a layer of indirection to allow this to happen.

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>
Reviewed-by: Matthias Maennich <maennich@google.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
include/linux/module.h

index c9f1200..f433823 100644 (file)
@@ -290,7 +290,8 @@ 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_INFO(import_ns, #ns)
+#define MODULE_IMPORT_NS(ns)   _MODULE_IMPORT_NS(ns)
 
 struct notifier_block;