From 44ae43b48139df1b36ca613a3877c7f2f2c6f1e6 Mon Sep 17 00:00:00 2001 From: Michal Hocko Date: Mon, 29 Apr 2013 15:07:43 -0700 Subject: [PATCH] --- yaml --- r: 365409 b: refs/heads/master c: acb6d558f4c8fbacc8e774c9d7737220a3777882 h: refs/heads/master i: 365407: a7bd890e666c93d68652f69a5dd2232493c75cc7 v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 780ba2c71ee4..9af3e1c67b5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee5df0570c8af2610b28ab79bd8f8f8195687773 +refs/heads/master: acb6d558f4c8fbacc8e774c9d7737220a3777882 diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c index 2bdac3ececd0..d280016039f2 100644 --- a/trunk/mm/memcontrol.c +++ b/trunk/mm/memcontrol.c @@ -5025,9 +5025,6 @@ static ssize_t mem_cgroup_read(struct cgroup *cont, struct cftype *cft, type = MEMFILE_TYPE(cft->private); name = MEMFILE_ATTR(cft->private); - if (!do_swap_account && type == _MEMSWAP) - return -EOPNOTSUPP; - switch (type) { case _MEM: if (name == RES_USAGE) @@ -5162,9 +5159,6 @@ static int mem_cgroup_write(struct cgroup *cont, struct cftype *cft, type = MEMFILE_TYPE(cft->private); name = MEMFILE_ATTR(cft->private); - if (!do_swap_account && type == _MEMSWAP) - return -EOPNOTSUPP; - switch (name) { case RES_LIMIT: if (mem_cgroup_is_root(memcg)) { /* Can't set limit on root */ @@ -5241,9 +5235,6 @@ static int mem_cgroup_reset(struct cgroup *cont, unsigned int event) type = MEMFILE_TYPE(event); name = MEMFILE_ATTR(event); - if (!do_swap_account && type == _MEMSWAP) - return -EOPNOTSUPP; - switch (name) { case RES_MAX_USAGE: if (type == _MEM)