summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2015-06-26 05:19:19 +0200
committerRusty Russell <rusty@rustcorp.com.au>2015-06-28 07:20:12 +0200
commit20bdc2cfdbc484777b30b96fcdbb8994038f3ce1 (patch)
treed7d8e0b68d7dfcb7c41ca72083d3aa8f02a46613
parentparam: fix module param locks when !CONFIG_SYSFS. (diff)
downloadlinux-20bdc2cfdbc484777b30b96fcdbb8994038f3ce1.tar.xz
linux-20bdc2cfdbc484777b30b96fcdbb8994038f3ce1.zip
modules: only use mod->param_lock if CONFIG_MODULES
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--kernel/params.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/params.c b/kernel/params.c
index faa461c16f12..adc0bbc06cc5 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -30,7 +30,11 @@
static DEFINE_MUTEX(param_lock);
/* Use the module's mutex, or if built-in use the built-in mutex */
+#ifdef CONFIG_MODULES
#define KPARAM_MUTEX(mod) ((mod) ? &(mod)->param_lock : &param_lock)
+#else
+#define KPARAM_MUTEX(mod) (&param_lock)
+#endif
static inline void check_kparam_locked(struct module *mod)
{