OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-20140127' of git://git.infradead.org/linux-mtd
[android-x86/kernel.git]
/
kernel
/
cgroup_freezer.c
diff --git
a/kernel/cgroup_freezer.c
b/kernel/cgroup_freezer.c
index
f0ff64d
..
6c3154e
100644
(file)
--- a/
kernel/cgroup_freezer.c
+++ b/
kernel/cgroup_freezer.c
@@
-301,10
+301,9
@@
out_unlock:
spin_unlock_irq(&freezer->lock);
}
spin_unlock_irq(&freezer->lock);
}
-static int freezer_read(struct cgroup_subsys_state *css, struct cftype *cft,
- struct seq_file *m)
+static int freezer_read(struct seq_file *m, void *v)
{
{
- struct cgroup_subsys_state *pos;
+ struct cgroup_subsys_state *
css = seq_css(m), *
pos;
rcu_read_lock();
rcu_read_lock();
@@
-458,7
+457,7
@@
static struct cftype files[] = {
{
.name = "state",
.flags = CFTYPE_NOT_ON_ROOT,
{
.name = "state",
.flags = CFTYPE_NOT_ON_ROOT,
- .
read_seq_string
= freezer_read,
+ .
seq_show
= freezer_read,
.write_string = freezer_write,
},
{
.write_string = freezer_write,
},
{