diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig index 14c483d2b7c9..bcffc0e47647 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -687,7 +687,7 @@ config PID_NS | |||
687 | depends on NAMESPACES && EXPERIMENTAL | 687 | depends on NAMESPACES && EXPERIMENTAL |
688 | help | 688 | help |
689 | Support process id namespaces. This allows having multiple | 689 | Support process id namespaces. This allows having multiple |
690 | process with the same pid as long as they are in different | 690 | processes with the same pid as long as they are in different |
691 | pid namespaces. This is a building block of containers. | 691 | pid namespaces. This is a building block of containers. |
692 | 692 | ||
693 | Unless you want to work with an experimental feature | 693 | Unless you want to work with an experimental feature |
@@ -952,7 +952,7 @@ config COMPAT_BRK | |||
952 | Randomizing heap placement makes heap exploits harder, but it | 952 | Randomizing heap placement makes heap exploits harder, but it |
953 | also breaks ancient binaries (including anything libc5 based). | 953 | also breaks ancient binaries (including anything libc5 based). |
954 | This option changes the bootup default to heap randomization | 954 | This option changes the bootup default to heap randomization |
955 | disabled, and can be overriden runtime by setting | 955 | disabled, and can be overridden at runtime by setting |
956 | /proc/sys/kernel/randomize_va_space to 2. | 956 | /proc/sys/kernel/randomize_va_space to 2. |
957 | 957 | ||
958 | On non-ancient distros (post-2000 ones) N is usually a safe choice. | 958 | On non-ancient distros (post-2000 ones) N is usually a safe choice. |
@@ -1110,7 +1110,7 @@ config INIT_ALL_POSSIBLE | |||
1110 | cpu_possible_map, some of them chose to initialize cpu_possible_map | 1110 | cpu_possible_map, some of them chose to initialize cpu_possible_map |
1111 | with all 1s, and others with all 0s. When they were centralised, | 1111 | with all 1s, and others with all 0s. When they were centralised, |
1112 | it was better to provide this option than to break all the archs | 1112 | it was better to provide this option than to break all the archs |
1113 | and have several arch maintainers persuing me down dark alleys. | 1113 | and have several arch maintainers pursuing me down dark alleys. |
1114 | 1114 | ||
1115 | config STOP_MACHINE | 1115 | config STOP_MACHINE |
1116 | bool | 1116 | bool |