aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init/Kconfig2
-rw-r--r--mm/page_cgroup.c7
2 files changed, 2 insertions, 7 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 14c483d2b7c9..92d410603932 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -597,6 +597,8 @@ config CGROUP_MEM_RES_CTLR_SWAP
597 is disabled by boot option, this will be automatically disabled and 597 is disabled by boot option, this will be automatically disabled and
598 there will be no overhead from this. Even when you set this config=y, 598 there will be no overhead from this. Even when you set this config=y,
599 if boot option "noswapaccount" is set, swap will not be accounted. 599 if boot option "noswapaccount" is set, swap will not be accounted.
600 Now, memory usage of swap_cgroup is 2 bytes per entry. If swap page
601 size is 4096bytes, 512k per 1Gbytes of swap.
600 602
601endif # CGROUPS 603endif # CGROUPS
602 604
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index ebf81074bed4..791905c991df 100644
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -426,13 +426,6 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
426 } 426 }
427 mutex_unlock(&swap_cgroup_mutex); 427 mutex_unlock(&swap_cgroup_mutex);
428 428
429 printk(KERN_INFO
430 "swap_cgroup: uses %ld bytes of vmalloc for pointer array space"
431 " and %ld bytes to hold mem_cgroup information per swap ents\n",
432 array_size, length * PAGE_SIZE);
433 printk(KERN_INFO
434 "swap_cgroup can be disabled by noswapaccount boot option.\n");
435
436 return 0; 429 return 0;
437nomem: 430nomem:
438 printk(KERN_INFO "couldn't allocate enough memory for swap_cgroup.\n"); 431 printk(KERN_INFO "couldn't allocate enough memory for swap_cgroup.\n");