X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flinux%2Fcgroup.h;h=499900d0cee7110748229ee3898b50734352e5e4;hb=cfebe563bd0a3ff97e1bc167123120d59c7a84db;hp=e267e62827bbc4e564c930576fcee8b70a8c4a79;hpb=022992ee59e90fef719493c09988884be157fb73;p=deliverable%2Flinux.git

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index e267e62827bb..499900d0cee7 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -99,6 +99,7 @@ static inline bool css_tryget(struct cgroup_subsys_state *css)
 	while (!atomic_inc_not_zero(&css->refcnt)) {
 		if (test_bit(CSS_REMOVED, &css->flags))
 			return false;
+		cpu_relax();
 	}
 	return true;
 }
@@ -377,6 +378,7 @@ struct cgroup_subsys {
 	 * - initiating hotplug events
 	 */
 	struct mutex hierarchy_mutex;
+	struct lock_class_key subsys_key;
 
 	/*
 	 * Link to parent, and list entry in parent's children.