Merge branch 'linus' into core/percpu

Conflicts:
	kernel/irq/handle.c

1 files changed, 1 insertions, 0 deletions

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index e267e62827bb..e4e8e117d27d 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;
 }