diff options
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/init/Kconfig b/init/Kconfig index 031344f954fd..c6b70313bf0b 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -299,6 +299,13 @@ config CGROUP_NS | |||
299 | for instance virtual servers and checkpoint/restart | 299 | for instance virtual servers and checkpoint/restart |
300 | jobs. | 300 | jobs. |
301 | 301 | ||
302 | config CGROUP_FREEZER | ||
303 | bool "control group freezer subsystem" | ||
304 | depends on CGROUPS | ||
305 | help | ||
306 | Provides a way to freeze and unfreeze all tasks in a | ||
307 | cgroup. | ||
308 | |||
302 | config CGROUP_DEVICE | 309 | config CGROUP_DEVICE |
303 | bool "Device controller for cgroups" | 310 | bool "Device controller for cgroups" |
304 | depends on CGROUPS && EXPERIMENTAL | 311 | depends on CGROUPS && EXPERIMENTAL |
@@ -713,6 +720,14 @@ config SHMEM | |||
713 | option replaces shmem and tmpfs with the much simpler ramfs code, | 720 | option replaces shmem and tmpfs with the much simpler ramfs code, |
714 | which may be appropriate on small systems without swap. | 721 | which may be appropriate on small systems without swap. |
715 | 722 | ||
723 | config AIO | ||
724 | bool "Enable AIO support" if EMBEDDED | ||
725 | default y | ||
726 | help | ||
727 | This option enables POSIX asynchronous I/O which may by used | ||
728 | by some high performance threaded applications. Disabling | ||
729 | this option saves about 7k. | ||
730 | |||
716 | config VM_EVENT_COUNTERS | 731 | config VM_EVENT_COUNTERS |
717 | default y | 732 | default y |
718 | bool "Enable VM event counters for /proc/vmstat" if EMBEDDED | 733 | bool "Enable VM event counters for /proc/vmstat" if EMBEDDED |
@@ -786,16 +801,6 @@ config MARKERS | |||
786 | 801 | ||
787 | source "arch/Kconfig" | 802 | source "arch/Kconfig" |
788 | 803 | ||
789 | config PROC_PAGE_MONITOR | ||
790 | default y | ||
791 | depends on PROC_FS && MMU | ||
792 | bool "Enable /proc page monitoring" if EMBEDDED | ||
793 | help | ||
794 | Various /proc files exist to monitor process memory utilization: | ||
795 | /proc/pid/smaps, /proc/pid/clear_refs, /proc/pid/pagemap, | ||
796 | /proc/kpagecount, and /proc/kpageflags. Disabling these | ||
797 | interfaces will reduce the size of the kernel by approximately 4kb. | ||
798 | |||
799 | endmenu # General setup | 804 | endmenu # General setup |
800 | 805 | ||
801 | config HAVE_GENERIC_DMA_COHERENT | 806 | config HAVE_GENERIC_DMA_COHERENT |