---

yaml --- r: 139669 b: refs/heads/master c: 627991a h: refs/heads/master i: 139667: bbdde1f v: v3
git-mirror · Apr 3, 2009 · dfe6776 · dfe6776
1 parent 5d78da5
commit dfe6776
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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");