From dfe6776bfa331683bbd76b86b57d5545dd6ae0b7 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Thu, 2 Apr 2009 16:57:47 -0700 Subject: [PATCH] --- yaml --- r: 139669 b: refs/heads/master c: 627991a20b3f4d504d20466ab405fe035cb1a20a h: refs/heads/master i: 139667: bbdde1fc716f8fa474d9c463ca2e27c2d5dce876 v: v3 --- [refs] | 2 +- trunk/init/Kconfig | 2 ++ trunk/mm/page_cgroup.c | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 091bd472fb70..be8c336b226b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3b2d692690aef228e493b1beaafe5364cab3237 +refs/heads/master: 627991a20b3f4d504d20466ab405fe035cb1a20a diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 14c483d2b7c9..92d410603932 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -597,6 +597,8 @@ config CGROUP_MEM_RES_CTLR_SWAP is disabled by boot option, this will be automatically disabled and there will be no overhead from this. Even when you set this config=y, if boot option "noswapaccount" is set, swap will not be accounted. + Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page + size is 4096bytes, 512k per 1Gbytes of swap. endif # CGROUPS diff --git a/trunk/mm/page_cgroup.c b/trunk/mm/page_cgroup.c index ebf81074bed4..791905c991df 100644 --- a/trunk/mm/page_cgroup.c +++ b/trunk/mm/page_cgroup.c @@ -426,13 +426,6 @@ int swap_cgroup_swapon(int type, unsigned long max_pages) } mutex_unlock(&swap_cgroup_mutex); - printk(KERN_INFO - "swap_cgroup: uses %ld bytes of vmalloc for pointer array space" - " and %ld bytes to hold mem_cgroup information per swap ents\n", - array_size, length * PAGE_SIZE); - printk(KERN_INFO - "swap_cgroup can be disabled by noswapaccount boot option.\n"); - return 0; nomem: printk(KERN_INFO "couldn't allocate enough memory for swap_cgroup.\n");