Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index f2a3f5c9936c909a0b021425eec64a043a46b99f..382109b5baebc2a79d31f041ceb51babd1474c95 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -3405,7 +3405,7 @@ unsigned short css_depth(struct cgroup_subsys_state *css)
 }
 
 bool css_is_ancestor(struct cgroup_subsys_state *child,
-                   struct cgroup_subsys_state *root)
+                   const struct cgroup_subsys_state *root)
 {
        struct css_id *child_id = rcu_dereference(child->id);
        struct css_id *root_id = rcu_dereference(root->id);