Commit 1b3dfde3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 72714841 31409c97

security/device_cgroup.c

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