driver-core: fix build for !CONFIG_MODULES (80c6e146) · Commits · 戴 / test

Commit ("driver-core: add driver module asynchronous probe support") broke build in case modules are disabled, because in this case "struct module" is not defined and we can't dereference it. Let's define module_requested_async_probing() helper and stub it out if modules are disabled. Reported-by:

kbuild test robot <fengguang.wu@intel.com> Reported-by:

Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by:

Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/base/dd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -427,7 +427,7 @@ bool driver_allows_async_probing(struct device_driver *drv)
		return false;

		default:
		if (drv->owner && drv->owner->async_probe_requested)
		if (module_requested_async_probing(drv->owner))
		return true;

		return false;

include/linux/module.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -510,6 +510,11 @@ int unregister_module_notifier(struct notifier_block *nb);

		extern void print_modules(void);

		static inline bool module_requested_async_probing(struct module *module)
		{
		return module && module->async_probe_requested;
		}

		#else /* !CONFIG_MODULES... */

		/* Given an address, look for it in the exception tables. */
		@@ -620,6 +625,12 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
		static inline void print_modules(void)
		{
		}

		static inline bool module_requested_async_probing(struct module *module)
		{
		return false;
		}

		#endif /* CONFIG_MODULES */

		#ifdef CONFIG_SYSFS

Admin message