diff options
Diffstat (limited to 'init/Kconfig')
-rw-r--r-- | init/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/init/Kconfig b/init/Kconfig index 236a79377b8e..90e884bb5216 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -565,7 +565,7 @@ config CGROUP_MEM_RES_CTLR | |||
565 | select MM_OWNER | 565 | select MM_OWNER |
566 | help | 566 | help |
567 | Provides a memory resource controller that manages both anonymous | 567 | Provides a memory resource controller that manages both anonymous |
568 | memory and page cache. (See Documentation/controllers/memory.txt) | 568 | memory and page cache. (See Documentation/cgroups/memory.txt) |
569 | 569 | ||
570 | Note that setting this option increases fixed memory overhead | 570 | Note that setting this option increases fixed memory overhead |
571 | associated with each page of memory in the system. By this, | 571 | associated with each page of memory in the system. By this, |
@@ -689,7 +689,7 @@ config PID_NS | |||
689 | depends on NAMESPACES && EXPERIMENTAL | 689 | depends on NAMESPACES && EXPERIMENTAL |
690 | help | 690 | help |
691 | Support process id namespaces. This allows having multiple | 691 | Support process id namespaces. This allows having multiple |
692 | process with the same pid as long as they are in different | 692 | processes with the same pid as long as they are in different |
693 | pid namespaces. This is a building block of containers. | 693 | pid namespaces. This is a building block of containers. |
694 | 694 | ||
695 | Unless you want to work with an experimental feature | 695 | Unless you want to work with an experimental feature |
@@ -954,7 +954,7 @@ config COMPAT_BRK | |||
954 | Randomizing heap placement makes heap exploits harder, but it | 954 | Randomizing heap placement makes heap exploits harder, but it |
955 | also breaks ancient binaries (including anything libc5 based). | 955 | also breaks ancient binaries (including anything libc5 based). |
956 | This option changes the bootup default to heap randomization | 956 | This option changes the bootup default to heap randomization |
957 | disabled, and can be overriden runtime by setting | 957 | disabled, and can be overridden at runtime by setting |
958 | /proc/sys/kernel/randomize_va_space to 2. | 958 | /proc/sys/kernel/randomize_va_space to 2. |
959 | 959 | ||
960 | On non-ancient distros (post-2000 ones) N is usually a safe choice. | 960 | On non-ancient distros (post-2000 ones) N is usually a safe choice. |
@@ -1124,7 +1124,7 @@ config INIT_ALL_POSSIBLE | |||
1124 | cpu_possible_map, some of them chose to initialize cpu_possible_map | 1124 | cpu_possible_map, some of them chose to initialize cpu_possible_map |
1125 | with all 1s, and others with all 0s. When they were centralised, | 1125 | with all 1s, and others with all 0s. When they were centralised, |
1126 | it was better to provide this option than to break all the archs | 1126 | it was better to provide this option than to break all the archs |
1127 | and have several arch maintainers persuing me down dark alleys. | 1127 | and have several arch maintainers pursuing me down dark alleys. |
1128 | 1128 | ||
1129 | config STOP_MACHINE | 1129 | config STOP_MACHINE |
1130 | bool | 1130 | bool |