aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-09-12 10:26:24 +0200
committerIngo Molnar <mingo@kernel.org>2015-09-12 10:26:24 +0200
commit31409c97640ff5f1a49e34ac7f3c82097bf57bec (patch)
treed75ec078a32fbc773c9b14c394392a864694c785
parente713c80a4e49d4bed5324d24755e42bf01c87556 (diff)
parentdc3a04d551b5d21f1badbb39bfe8e5bc1289b184 (diff)
downloadlinux-linaro-stable-31409c97640ff5f1a49e34ac7f3c82097bf57bec.tar.gz
Merge branch 'for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent
Pull RCU fix from Paul E. McKenney, fixing an inverted RCU_LOCKDEP_WARN() condition. Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--security/device_cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 73455089feef..03c1652c9a1f 100644
--- a/security/device_cgroup.c
+++ b/security/device_cgroup.c
@@ -401,7 +401,7 @@ static bool verify_new_ex(struct dev_cgroup *dev_cgroup,
bool match = false;
RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&
- lockdep_is_held(&devcgroup_mutex),
+ !lockdep_is_held(&devcgroup_mutex),
"device_cgroup:verify_new_ex called without proper synchronization");
if (dev_cgroup->behavior == DEVCG_DEFAULT_ALLOW) {