Explorar o código

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RCU fix from Ingo Molnar:
 "Fix a false positive warning"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  security/device_cgroup: Fix RCU_LOCKDEP_WARN() condition
Linus Torvalds %!s(int64=10) %!d(string=hai) anos
pai
achega
1b3dfde386
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      security/device_cgroup.c

+ 1 - 1
security/device_cgroup.c

@@ -401,7 +401,7 @@ static bool verify_new_ex(struct dev_cgroup *dev_cgroup,
 	bool match = false;
 	bool match = false;
 
 
 	RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&
 	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");
 			 "device_cgroup:verify_new_ex called without proper synchronization");
 
 
 	if (dev_cgroup->behavior == DEVCG_DEFAULT_ALLOW) {
 	if (dev_cgroup->behavior == DEVCG_DEFAULT_ALLOW) {