git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
kernel
/
cgroup_debug.c
diff --git
a/kernel/cgroup_debug.c
b/kernel/cgroup_debug.c
index
37301e8
..
c3dc3ab
100644
(file)
--- a/
kernel/cgroup_debug.c
+++ b/
kernel/cgroup_debug.c
@@
-1,5
+1,5
@@
/*
/*
- * kernel/c
container
_debug.c - Example cgroup subsystem that
+ * kernel/c
group
_debug.c - Example cgroup subsystem that
* exposes debug info
*
* Copyright (C) Google Inc, 2007
* exposes debug info
*
* Copyright (C) Google Inc, 2007
@@
-62,25
+62,35
@@
static u64 current_css_set_refcount_read(struct cgroup *cont,
return count;
}
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",
static struct cftype files[] = {
{
.name = "cgroup_refcount",
- .read_u
int
= cgroup_refcount_read,
+ .read_u
64
= cgroup_refcount_read,
},
{
.name = "taskcount",
},
{
.name = "taskcount",
- .read_u
int
= taskcount_read,
+ .read_u
64
= taskcount_read,
},
{
.name = "current_css_set",
},
{
.name = "current_css_set",
- .read_u
int
= current_css_set_read,
+ .read_u
64
= current_css_set_read,
},
{
.name = "current_css_set_refcount",
},
{
.name = "current_css_set_refcount",
- .read_u
int
= current_css_set_refcount_read,
+ .read_u
64
= current_css_set_refcount_read,
},
},
+
+ {
+ .name = "releasable",
+ .read_u64 = releasable_read,
+ }
};
static int debug_populate(struct cgroup_subsys *ss, struct cgroup *cont)
};
static int debug_populate(struct cgroup_subsys *ss, struct cgroup *cont)