aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2014-12-10 18:44:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 20:41:09 -0500
commit9edad6ea0f1416415f6fe31cc9d1dbc3817803ed (patch)
tree0f734696a3f9e66ce5f43f602a78736c0ff66b68 /init
parent5d1ea48bdde67898e87d6d8f511fd097fa64c749 (diff)
mm: move page->mem_cgroup bad page handling into generic code
Now that the external page_cgroup data structure and its lookup is gone, let the generic bad_page() check for page->mem_cgroup sanity. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.cz> Acked-by: Vladimir Davydov <vdavydov@parallels.com> Acked-by: David S. Miller <davem@davemloft.net> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: Tejun Heo <tj@kernel.org> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig12
1 files changed, 0 insertions, 12 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 46768752130d..7e9fbd48e2ab 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -983,18 +983,6 @@ config MEMCG
983 Provides a memory resource controller that manages both anonymous 983 Provides a memory resource controller that manages both anonymous
984 memory and page cache. (See Documentation/cgroups/memory.txt) 984 memory and page cache. (See Documentation/cgroups/memory.txt)
985 985
986 Note that setting this option increases fixed memory overhead
987 associated with each page of memory in the system. By this,
988 8(16)bytes/PAGE_SIZE on 32(64)bit system will be occupied by memory
989 usage tracking struct at boot. Total amount of this is printed out
990 at boot.
991
992 Only enable when you're ok with these trade offs and really
993 sure you need the memory resource controller. Even when you enable
994 this, you can set "cgroup_disable=memory" at your boot option to
995 disable memory resource controller and you can avoid overheads.
996 (and lose benefits of memory resource controller)
997
998config MEMCG_SWAP 986config MEMCG_SWAP
999 bool "Memory Resource Controller Swap Extension" 987 bool "Memory Resource Controller Swap Extension"
1000 depends on MEMCG && SWAP 988 depends on MEMCG && SWAP