diff options
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/init/Kconfig b/init/Kconfig index 98ebf3725412..074ac97f55e3 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -366,6 +366,21 @@ config RESOURCE_COUNTERS | |||
366 | infrastructure that works with cgroups | 366 | infrastructure that works with cgroups |
367 | depends on CGROUPS | 367 | depends on CGROUPS |
368 | 368 | ||
369 | config CGROUP_MEM_RES_CTLR | ||
370 | bool "Memory Resource Controller for Control Groups" | ||
371 | depends on CGROUPS && RESOURCE_COUNTERS | ||
372 | help | ||
373 | Provides a memory resource controller that manages both page cache and | ||
374 | RSS memory. | ||
375 | |||
376 | Note that setting this option increases fixed memory overhead | ||
377 | associated with each page of memory in the system by 4/8 bytes | ||
378 | and also increases cache misses because struct page on many 64bit | ||
379 | systems will not fit into a single cache line anymore. | ||
380 | |||
381 | Only enable when you're ok with these trade offs and really | ||
382 | sure you need the memory resource controller. | ||
383 | |||
369 | config SYSFS_DEPRECATED | 384 | config SYSFS_DEPRECATED |
370 | bool | 385 | bool |
371 | 386 | ||
@@ -392,21 +407,6 @@ config SYSFS_DEPRECATED_V2 | |||
392 | If you are using a distro with the most recent userspace | 407 | If you are using a distro with the most recent userspace |
393 | packages, it should be safe to say N here. | 408 | packages, it should be safe to say N here. |
394 | 409 | ||
395 | config CGROUP_MEM_CONT | ||
396 | bool "Memory controller for cgroups" | ||
397 | depends on CGROUPS && RESOURCE_COUNTERS | ||
398 | help | ||
399 | Provides a memory controller that manages both page cache and | ||
400 | RSS memory. | ||
401 | |||
402 | Note that setting this option increases fixed memory overhead | ||
403 | associated with each page of memory in the system by 4/8 bytes | ||
404 | and also increases cache misses because struct page on many 64bit | ||
405 | systems will not fit into a single cache line anymore. | ||
406 | |||
407 | Only enable when you're ok with these trade offs and really | ||
408 | sure you need the memory controller. | ||
409 | |||
410 | config PROC_PID_CPUSET | 410 | config PROC_PID_CPUSET |
411 | bool "Include legacy /proc/<pid>/cpuset file" | 411 | bool "Include legacy /proc/<pid>/cpuset file" |
412 | depends on CPUSETS | 412 | depends on CPUSETS |