Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge

1 files changed, 15 insertions, 5 deletions

diff --git a/kernel/cgroup_debug.c b/kernel/cgroup_debug.c
index 37301e877cb0..c3dc3aba4c02 100644
--- a/kernel/cgroup_debug.c
+++ b/kernel/cgroup_debug.c
@@ -1,5 +1,5 @@
 /*
- * kernel/ccontainer_debug.c - Example cgroup subsystem that
+ * kernel/cgroup_debug.c - Example cgroup subsystem that
  * exposes debug info
  *
  * Copyright (C) Google Inc, 2007
@@ -62,25 +62,35 @@ static u64 current_css_set_refcount_read(struct cgroup *cont,
         return count;
 }
 
+static u64 releasable_read(struct cgroup *cgrp, struct cftype *cft)
+{
+        return test_bit(CGRP_RELEASABLE, &cgrp->flags);
+}
+
 static struct cftype files[] =  {
         {
                 .name = "cgroup_refcount",
-                .read_uint = cgroup_refcount_read,
+                .read_u64 = cgroup_refcount_read,
         },
         {
                 .name = "taskcount",
-                .read_uint = taskcount_read,
+                .read_u64 = taskcount_read,
         },
 
         {
                 .name = "current_css_set",
-                .read_uint = current_css_set_read,
+                .read_u64 = current_css_set_read,
         },
 
         {
                 .name = "current_css_set_refcount",
-                .read_uint = current_css_set_refcount_read,
+                .read_u64 = current_css_set_refcount_read,
         },
+
+        {
+                .name = "releasable",
+                .read_u64 = releasable_read,
+        }
 };
 
 static int debug_populate(struct cgroup_subsys *ss, struct cgroup *cont)