Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31409c97 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'for-mingo' of... 

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: default avatarIngo Molnar <mingo@kernel.org>
parents e713c80a dc3a04d5

security/device_cgroup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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) {