diff --git a/[refs] b/[refs] index 4e1fa01f4cf4..1e114c02840f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a81792f668c20540c336af4242ba1400763eb14f +refs/heads/master: df648c9fbebb4de50e7a6e76cc253c7cb0421f9b diff --git a/trunk/include/linux/kmod.h b/trunk/include/linux/kmod.h index 5dc13848891b..9bdb28d6660f 100644 --- a/trunk/include/linux/kmod.h +++ b/trunk/include/linux/kmod.h @@ -29,11 +29,12 @@ /* modprobe exit status on success, -ve on error. Return value * usually useless though. */ extern int request_module(const char * name, ...) __attribute__ ((format (printf, 1, 2))); +#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x))) #else static inline int request_module(const char * name, ...) { return -ENOSYS; } +#define try_then_request_module(x, mod...) (x) #endif -#define try_then_request_module(x, mod...) ((x) ?: (request_module(mod), (x))) struct key; struct file;