summaryrefslogtreecommitdiffstats
path: root/include/linux/kmod.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-07-08 19:00:18 +0200
committerRusty Russell <rusty@rustcorp.com.au>2008-07-22 19:24:29 +1000
commitdf648c9fbebb4de50e7a6e76cc253c7cb0421f9b (patch)
tree909e31ce61020e65b45f2c0caef3492b9a376b4a /include/linux/kmod.h
parenta81792f668c20540c336af4242ba1400763eb14f (diff)
downloadlinux-stable-df648c9fbebb4de50e7a6e76cc253c7cb0421f9b.tar.gz
linux-stable-df648c9fbebb4de50e7a6e76cc253c7cb0421f9b.tar.bz2
linux-stable-df648c9fbebb4de50e7a6e76cc253c7cb0421f9b.zip
rework try_then_request_module to do less in non-modular kernels
This reworks try_then_request_module to only invoke the "lookup" function "x" once when the kernel is not modular. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'include/linux/kmod.h')
-rw-r--r--include/linux/kmod.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 5dc13848891b..9bdb28d6660f 100644
--- a/include/linux/kmod.h
+++ b/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;