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

[muen/linux.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 8c490130c4fb0072838801534948d9ec6b9a285f..84530ab358c37ad876744d5ebda5d277dfb6d065 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -750,7 +750,7 @@ static inline void update_cgrp_time_from_event(struct perf_event *event)
        /*
         * Do not update time when cgroup is not active
         */
        /*
         * Do not update time when cgroup is not active
         */

-       if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))
+       if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup))

                __update_cgrp_time(event->cgrp);
 }
 
                __update_cgrp_time(event->cgrp);
 }