Alan Jenkins <sourcejedi.lkml-gM/Ye1E23mwN+BqQ9rBEUg@xxxxxxxxxxxxxxxx> writes: > I agree that commit looks like it should be a no-op though :-). But it isn't. Andreas. --- Fix try_then_request_module to use waiting __request_module again. Signed-off-by: Andreas Schwab <schwab@xxxxxxxxxxxxxx> --- include/linux/kmod.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.30-rc1/include/linux/kmod.h =================================================================== --- linux-2.6.30-rc1.orig/include/linux/kmod.h 2009-04-08 12:47:54.000000000 +0200 +++ linux-2.6.30-rc1/include/linux/kmod.h 2009-04-08 17:39:35.000000000 +0200 @@ -34,7 +34,7 @@ extern int __request_module(bool wait, c #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; } -- Andreas Schwab, schwab@xxxxxxxxxxxxxx GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html