diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-17 18:18:22 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-17 18:18:28 +0400 |
| commit | 5043124e660fcc3ddefe4239ddfa017bf13f5081 (patch) | |
| tree | 06875cdb942afe460dbac33acf3e8223c805a35d /include/linux/kmod.h | |
| parent | 77857dc07247ed5fa700a197c96ef842d8dbebdf (diff) | |
| parent | 9f76208c33984ab777eace5d07a4e36e88703e02 (diff) | |
| download | linux-5043124e660fcc3ddefe4239ddfa017bf13f5081.tar.xz | |
Merge branch 'linus' into x86/apic
Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/kmod.h')
| -rw-r--r-- | include/linux/kmod.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index d5fa565086d1..384ca8bbf1ac 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -34,7 +34,7 @@ extern int __request_module(bool wait, const char *name, ...) \ #define request_module(mod...) __request_module(true, mod) #define request_module_nowait(mod...) __request_module(false, mod) #define try_then_request_module(x, mod...) \ - ((x) ?: (__request_module(false, mod), (x))) + ((x) ?: (__request_module(true, mod), (x))) #else static inline int request_module(const char *name, ...) { return -ENOSYS; } static inline int request_module_nowait(const char *name, ...) { return -ENOSYS; } |