mem_cgroup_swappiness() oopses immediately when
booted with cgroup_disable=memory. Fix that in the obvious inelegant
way for now - though I hope we are moving towards a world in which
almost all of the mem_cgroup_disabled() tests will vanish, with a
root_mem_cgroup which can handle the basics even when disabled.
Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
---
mm/memcontrol.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- mmotm/mm/memcontrol.c 2014-05-21 18:12:18.072022438 -0700
+++ linux/mm/memcontrol.c 2014-05-21 19:34:30.608546905 -0700
@@ -1531,7 +1531,7 @@ static unsigned long mem_cgroup_margin(s
int mem_cgroup_swappiness(struct mem_cgroup *memcg)
{
/* root ? */
- if (!memcg->css.parent)
+ if (mem_cgroup_disabled() || !memcg->css.parent)
return vm_swappiness;
return memcg->swappiness;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>