diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-05-21 18:49:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-24 15:28:30 -0400 |
commit | 80c6e1465948c2e91214f01764f427d31ebedb26 (patch) | |
tree | 51e7810eb55f67d49b43eece7f9f8d46a25228a7 /include/linux/module.h | |
parent | 802a87fd5be9cac1d05879bcdae2620e46b0dbe6 (diff) |
driver-core: fix build for !CONFIG_MODULES
Commit f2411da74698 ("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>
Diffstat (limited to 'include/linux/module.h')
-rw-r--r-- | include/linux/module.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index f46a47d3c0dc..57f5c0a804c0 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
@@ -510,6 +510,11 @@ int unregister_module_notifier(struct notifier_block *nb); | |||
510 | 510 | ||
511 | extern void print_modules(void); | 511 | extern void print_modules(void); |
512 | 512 | ||
513 | static inline bool module_requested_async_probing(struct module *module) | ||
514 | { | ||
515 | return module && module->async_probe_requested; | ||
516 | } | ||
517 | |||
513 | #else /* !CONFIG_MODULES... */ | 518 | #else /* !CONFIG_MODULES... */ |
514 | 519 | ||
515 | /* Given an address, look for it in the exception tables. */ | 520 | /* 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 | static inline void print_modules(void) | 625 | static inline void print_modules(void) |
621 | { | 626 | { |
622 | } | 627 | } |
628 | |||
629 | static inline bool module_requested_async_probing(struct module *module) | ||
630 | { | ||
631 | return false; | ||
632 | } | ||
633 | |||
623 | #endif /* CONFIG_MODULES */ | 634 | #endif /* CONFIG_MODULES */ |
624 | 635 | ||
625 | #ifdef CONFIG_SYSFS | 636 | #ifdef CONFIG_SYSFS |