x86/Kconfig: Fix indentation and add endif comments to arch/x86/Kconfig

The convention for indentation seems to be a single tab. Help text is
further indented by an additional two whitespaces. Fix the lines that
violate these rules.

While add it, add missing trailing endif comments and squeeze multiple
empty lines.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20220525133203.52463-2-juerg.haefliger@canonical.com

authored by Juerg Haefliger and committed by Ingo Molnar 758cd94a 6f3f04c1

+49 -52
+49 -52
arch/x86/Kconfig
··· 41 depends on FUNCTION_TRACER 42 select DYNAMIC_FTRACE 43 help 44 - We keep the static function tracing (!DYNAMIC_FTRACE) around 45 - in order to test the non static function tracing in the 46 - generic code, as other architectures still use it. But we 47 - only need to keep it around for x86_64. No need to keep it 48 - for x86_32. For x86_32, force DYNAMIC_FTRACE. 49 # 50 # Arch settings 51 # ··· 392 default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT 393 default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC)) 394 help 395 - We have to make sure stack protector is unconditionally disabled if 396 - the compiler produces broken code or if it does not let us control 397 - the segment on 32-bit kernels. 398 399 menu "Processor type and features" 400 ··· 530 531 If you have one of these systems, or if you want to build a 532 generic distribution kernel, say Y here - otherwise say N. 533 - endif 534 535 if X86_64 536 config X86_EXTENDED_PLATFORM ··· 549 550 If you have one of these systems, or if you want to build a 551 generic distribution kernel, say Y here - otherwise say N. 552 - endif 553 # This is an alphabetically sorted list of 64 bit extended platforms 554 # Please maintain the alphabetic order if and when there are additions 555 config X86_NUMACHIP ··· 597 bool "Goldfish (Virtual Platform)" 598 depends on X86_EXTENDED_PLATFORM 599 help 600 - Enable support for the Goldfish virtual platform used primarily 601 - for Android development. Unless you are building for the Android 602 - Goldfish emulator say N here. 603 604 config X86_INTEL_CE 605 bool "CE4100 TV platform" ··· 898 memory contents and CPU state. TDX guests are protected from 899 some attacks from the VMM. 900 901 - endif #HYPERVISOR_GUEST 902 903 source "arch/x86/Kconfig.cpu" 904 ··· 1159 prompt "Intel MCE features" 1160 depends on X86_MCE && X86_LOCAL_APIC 1161 help 1162 - Additional support for intel specific MCE features such as 1163 - the thermal monitor. 1164 1165 config X86_MCE_AMD 1166 def_bool y 1167 prompt "AMD MCE features" 1168 depends on X86_MCE && X86_LOCAL_APIC && AMD_NB 1169 help 1170 - Additional support for AMD specific MCE features such as 1171 - the DRAM Error Threshold. 1172 1173 config X86_ANCIENT_MCE 1174 bool "Support for old Pentium 5 / WinChip machine checks" ··· 1246 default y 1247 depends on X86_64 1248 help 1249 - This enables emulation of the legacy vsyscall page. Disabling 1250 - it is roughly equivalent to booting with vsyscall=none, except 1251 - that it will also disable the helpful warning if a program 1252 - tries to use a vsyscall. With this option set to N, offending 1253 - programs will just segfault, citing addresses of the form 1254 - 0xffffffffff600?00. 1255 1256 - This option is required by many programs built before 2013, and 1257 - care should be used even with newer programs if set to N. 1258 1259 - Disabling this option saves about 7K of kernel size and 1260 - possibly 4K of additional runtime pagetable memory. 1261 1262 config X86_IOPL_IOPERM 1263 bool "IOPERM and IOPL Emulation" ··· 1994 bool "EFI mixed-mode support" 1995 depends on EFI_STUB && X86_64 1996 help 1997 - Enabling this feature allows a 64-bit kernel to be booted 1998 - on a 32-bit firmware, provided that your CPU supports 64-bit 1999 - mode. 2000 2001 - Note that it is not possible to boot a mixed-mode enabled 2002 - kernel via the EFI boot stub - a bootloader that supports 2003 - the EFI handover protocol must be used. 2004 2005 - If unsure, say N. 2006 2007 source "kernel/Kconfig.hz" 2008 ··· 2227 select DYNAMIC_MEMORY_LAYOUT 2228 default RANDOMIZE_BASE 2229 help 2230 - Randomizes the base virtual address of kernel memory sections 2231 - (physical memory mapping, vmalloc & vmemmap). This security feature 2232 - makes exploits relying on predictable memory locations less reliable. 2233 2234 - The order of allocations remains unchanged. Entropy is generated in 2235 - the same way as RANDOMIZE_BASE. Current implementation in the optimal 2236 - configuration have in average 30,000 different possible virtual 2237 - addresses for each memory section. 2238 2239 - If unsure, say Y. 2240 2241 config RANDOMIZE_MEMORY_PHYSICAL_PADDING 2242 hex "Physical memory mapping padding" if EXPERT ··· 2246 range 0x1 0x40 if MEMORY_HOTPLUG 2247 range 0x0 0x40 2248 help 2249 - Define the padding in terabytes added to the existing physical 2250 - memory size during kernel memory randomization. It is useful 2251 - for memory hotplug support but reduces the entropy available for 2252 - address randomization. 2253 2254 - If unsure, leave at the default value. 2255 2256 config HOTPLUG_CPU 2257 def_bool y ··· 2598 2599 endmenu 2600 2601 - 2602 menu "Bus options (PCI etc.)" 2603 2604 choice ··· 2821 2822 endmenu 2823 2824 - 2825 menu "Binary Emulations" 2826 2827 config IA32_EMULATION ··· 2865 config SYSVIPC_COMPAT 2866 def_bool y 2867 depends on SYSVIPC 2868 - endif 2869 2870 endmenu 2871 - 2872 2873 config HAVE_ATOMIC_IOMAP 2874 def_bool y
··· 41 depends on FUNCTION_TRACER 42 select DYNAMIC_FTRACE 43 help 44 + We keep the static function tracing (!DYNAMIC_FTRACE) around 45 + in order to test the non static function tracing in the 46 + generic code, as other architectures still use it. But we 47 + only need to keep it around for x86_64. No need to keep it 48 + for x86_32. For x86_32, force DYNAMIC_FTRACE. 49 # 50 # Arch settings 51 # ··· 392 default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT 393 default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC)) 394 help 395 + We have to make sure stack protector is unconditionally disabled if 396 + the compiler produces broken code or if it does not let us control 397 + the segment on 32-bit kernels. 398 399 menu "Processor type and features" 400 ··· 530 531 If you have one of these systems, or if you want to build a 532 generic distribution kernel, say Y here - otherwise say N. 533 + endif # X86_32 534 535 if X86_64 536 config X86_EXTENDED_PLATFORM ··· 549 550 If you have one of these systems, or if you want to build a 551 generic distribution kernel, say Y here - otherwise say N. 552 + endif # X86_64 553 # This is an alphabetically sorted list of 64 bit extended platforms 554 # Please maintain the alphabetic order if and when there are additions 555 config X86_NUMACHIP ··· 597 bool "Goldfish (Virtual Platform)" 598 depends on X86_EXTENDED_PLATFORM 599 help 600 + Enable support for the Goldfish virtual platform used primarily 601 + for Android development. Unless you are building for the Android 602 + Goldfish emulator say N here. 603 604 config X86_INTEL_CE 605 bool "CE4100 TV platform" ··· 898 memory contents and CPU state. TDX guests are protected from 899 some attacks from the VMM. 900 901 + endif # HYPERVISOR_GUEST 902 903 source "arch/x86/Kconfig.cpu" 904 ··· 1159 prompt "Intel MCE features" 1160 depends on X86_MCE && X86_LOCAL_APIC 1161 help 1162 + Additional support for intel specific MCE features such as 1163 + the thermal monitor. 1164 1165 config X86_MCE_AMD 1166 def_bool y 1167 prompt "AMD MCE features" 1168 depends on X86_MCE && X86_LOCAL_APIC && AMD_NB 1169 help 1170 + Additional support for AMD specific MCE features such as 1171 + the DRAM Error Threshold. 1172 1173 config X86_ANCIENT_MCE 1174 bool "Support for old Pentium 5 / WinChip machine checks" ··· 1246 default y 1247 depends on X86_64 1248 help 1249 + This enables emulation of the legacy vsyscall page. Disabling 1250 + it is roughly equivalent to booting with vsyscall=none, except 1251 + that it will also disable the helpful warning if a program 1252 + tries to use a vsyscall. With this option set to N, offending 1253 + programs will just segfault, citing addresses of the form 1254 + 0xffffffffff600?00. 1255 1256 + This option is required by many programs built before 2013, and 1257 + care should be used even with newer programs if set to N. 1258 1259 + Disabling this option saves about 7K of kernel size and 1260 + possibly 4K of additional runtime pagetable memory. 1261 1262 config X86_IOPL_IOPERM 1263 bool "IOPERM and IOPL Emulation" ··· 1994 bool "EFI mixed-mode support" 1995 depends on EFI_STUB && X86_64 1996 help 1997 + Enabling this feature allows a 64-bit kernel to be booted 1998 + on a 32-bit firmware, provided that your CPU supports 64-bit 1999 + mode. 2000 2001 + Note that it is not possible to boot a mixed-mode enabled 2002 + kernel via the EFI boot stub - a bootloader that supports 2003 + the EFI handover protocol must be used. 2004 2005 + If unsure, say N. 2006 2007 source "kernel/Kconfig.hz" 2008 ··· 2227 select DYNAMIC_MEMORY_LAYOUT 2228 default RANDOMIZE_BASE 2229 help 2230 + Randomizes the base virtual address of kernel memory sections 2231 + (physical memory mapping, vmalloc & vmemmap). This security feature 2232 + makes exploits relying on predictable memory locations less reliable. 2233 2234 + The order of allocations remains unchanged. Entropy is generated in 2235 + the same way as RANDOMIZE_BASE. Current implementation in the optimal 2236 + configuration have in average 30,000 different possible virtual 2237 + addresses for each memory section. 2238 2239 + If unsure, say Y. 2240 2241 config RANDOMIZE_MEMORY_PHYSICAL_PADDING 2242 hex "Physical memory mapping padding" if EXPERT ··· 2246 range 0x1 0x40 if MEMORY_HOTPLUG 2247 range 0x0 0x40 2248 help 2249 + Define the padding in terabytes added to the existing physical 2250 + memory size during kernel memory randomization. It is useful 2251 + for memory hotplug support but reduces the entropy available for 2252 + address randomization. 2253 2254 + If unsure, leave at the default value. 2255 2256 config HOTPLUG_CPU 2257 def_bool y ··· 2598 2599 endmenu 2600 2601 menu "Bus options (PCI etc.)" 2602 2603 choice ··· 2822 2823 endmenu 2824 2825 menu "Binary Emulations" 2826 2827 config IA32_EMULATION ··· 2867 config SYSVIPC_COMPAT 2868 def_bool y 2869 depends on SYSVIPC 2870 + endif # COMPAT 2871 2872 endmenu 2873 2874 config HAVE_ATOMIC_IOMAP 2875 def_bool y