Commit 80c6e146 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman

driver-core: fix build for !CONFIG_MODULES

Commit f2411da7 ("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: default avatarkbuild test robot <fengguang.wu@intel.com>
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 802a87fd
...@@ -427,7 +427,7 @@ bool driver_allows_async_probing(struct device_driver *drv) ...@@ -427,7 +427,7 @@ bool driver_allows_async_probing(struct device_driver *drv)
return false; return false;
default: default:
if (drv->owner && drv->owner->async_probe_requested) if (module_requested_async_probing(drv->owner))
return true; return true;
return false; return false;
......
...@@ -510,6 +510,11 @@ int unregister_module_notifier(struct notifier_block *nb); ...@@ -510,6 +510,11 @@ int unregister_module_notifier(struct notifier_block *nb);
extern void print_modules(void); extern void print_modules(void);
static inline bool module_requested_async_probing(struct module *module)
{
return module && module->async_probe_requested;
}
#else /* !CONFIG_MODULES... */ #else /* !CONFIG_MODULES... */
/* Given an address, look for it in the exception tables. */ /* Given an address, look for it in the exception tables. */
...@@ -620,6 +625,12 @@ static inline int unregister_module_notifier(struct notifier_block *nb) ...@@ -620,6 +625,12 @@ static inline int unregister_module_notifier(struct notifier_block *nb)
static inline void print_modules(void) static inline void print_modules(void)
{ {
} }
static inline bool module_requested_async_probing(struct module *module)
{
return false;
}
#endif /* CONFIG_MODULES */ #endif /* CONFIG_MODULES */
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment