Commit 3e4d890a authored Sep 22, 2019 by Linus Torvalds

modules: make MODULE_IMPORT_NS() work even when modular builds are disabled



It's an unusual configuration, and was apparently never tested, and not
caught in linux-next because of a combination of travels and it making
it into the tree too late.

The fix is to simply move the #define to outside the CONFIG_MODULE
section, since MODULE_INFO() will do the right thing.

Cc: Martijn Coenen <maco@android.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Matthias Maennich <maennich@google.com>
Cc: Jessica Yu <jeyu@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 9dbd83f6

include/linux/module.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -276,12 +276,12 @@ 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)

		struct notifier_block;

		#ifdef CONFIG_MODULES

		#define MODULE_IMPORT_NS(ns) MODULE_INFO(import_ns, #ns)

		extern int modules_disabled; /* for sysctl */
		/* Get/put a kernel symbol (calls must be symmetric) */
		void __symbol_get(const char symbol);

Admin message