Skip to content

Commit

Permalink
x86/Kconfig: Fix indentation and add endif comments to arch/x86/Kconfig
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
Juerg Haefliger authored and Ingo Molnar committed May 25, 2022
1 parent 6f3f04c commit 758cd94
Showing 1 changed file with 49 additions and 52 deletions.
101 changes: 49 additions & 52 deletions arch/x86/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ config FORCE_DYNAMIC_FTRACE
depends on FUNCTION_TRACER
select DYNAMIC_FTRACE
help
We keep the static function tracing (!DYNAMIC_FTRACE) around
in order to test the non static function tracing in the
generic code, as other architectures still use it. But we
only need to keep it around for x86_64. No need to keep it
for x86_32. For x86_32, force DYNAMIC_FTRACE.
We keep the static function tracing (!DYNAMIC_FTRACE) around
in order to test the non static function tracing in the
generic code, as other architectures still use it. But we
only need to keep it around for x86_64. No need to keep it
for x86_32. For x86_32, force DYNAMIC_FTRACE.
#
# Arch settings
#
Expand Down Expand Up @@ -392,9 +392,9 @@ config CC_HAS_SANE_STACKPROTECTOR
default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT
default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC))
help
We have to make sure stack protector is unconditionally disabled if
the compiler produces broken code or if it does not let us control
the segment on 32-bit kernels.
We have to make sure stack protector is unconditionally disabled if
the compiler produces broken code or if it does not let us control
the segment on 32-bit kernels.

menu "Processor type and features"

Expand Down Expand Up @@ -530,7 +530,7 @@ config X86_EXTENDED_PLATFORM

If you have one of these systems, or if you want to build a
generic distribution kernel, say Y here - otherwise say N.
endif
endif # X86_32

if X86_64
config X86_EXTENDED_PLATFORM
Expand All @@ -549,7 +549,7 @@ config X86_EXTENDED_PLATFORM

If you have one of these systems, or if you want to build a
generic distribution kernel, say Y here - otherwise say N.
endif
endif # X86_64
# This is an alphabetically sorted list of 64 bit extended platforms
# Please maintain the alphabetic order if and when there are additions
config X86_NUMACHIP
Expand Down Expand Up @@ -597,9 +597,9 @@ config X86_GOLDFISH
bool "Goldfish (Virtual Platform)"
depends on X86_EXTENDED_PLATFORM
help
Enable support for the Goldfish virtual platform used primarily
for Android development. Unless you are building for the Android
Goldfish emulator say N here.
Enable support for the Goldfish virtual platform used primarily
for Android development. Unless you are building for the Android
Goldfish emulator say N here.

config X86_INTEL_CE
bool "CE4100 TV platform"
Expand Down Expand Up @@ -898,7 +898,7 @@ config INTEL_TDX_GUEST
memory contents and CPU state. TDX guests are protected from
some attacks from the VMM.

endif #HYPERVISOR_GUEST
endif # HYPERVISOR_GUEST

source "arch/x86/Kconfig.cpu"

Expand Down Expand Up @@ -1159,16 +1159,16 @@ config X86_MCE_INTEL
prompt "Intel MCE features"
depends on X86_MCE && X86_LOCAL_APIC
help
Additional support for intel specific MCE features such as
the thermal monitor.
Additional support for intel specific MCE features such as
the thermal monitor.

config X86_MCE_AMD
def_bool y
prompt "AMD MCE features"
depends on X86_MCE && X86_LOCAL_APIC && AMD_NB
help
Additional support for AMD specific MCE features such as
the DRAM Error Threshold.
Additional support for AMD specific MCE features such as
the DRAM Error Threshold.

config X86_ANCIENT_MCE
bool "Support for old Pentium 5 / WinChip machine checks"
Expand Down Expand Up @@ -1246,18 +1246,18 @@ config X86_VSYSCALL_EMULATION
default y
depends on X86_64
help
This enables emulation of the legacy vsyscall page. Disabling
it is roughly equivalent to booting with vsyscall=none, except
that it will also disable the helpful warning if a program
tries to use a vsyscall. With this option set to N, offending
programs will just segfault, citing addresses of the form
0xffffffffff600?00.
This enables emulation of the legacy vsyscall page. Disabling
it is roughly equivalent to booting with vsyscall=none, except
that it will also disable the helpful warning if a program
tries to use a vsyscall. With this option set to N, offending
programs will just segfault, citing addresses of the form
0xffffffffff600?00.

This option is required by many programs built before 2013, and
care should be used even with newer programs if set to N.
This option is required by many programs built before 2013, and
care should be used even with newer programs if set to N.

Disabling this option saves about 7K of kernel size and
possibly 4K of additional runtime pagetable memory.
Disabling this option saves about 7K of kernel size and
possibly 4K of additional runtime pagetable memory.

config X86_IOPL_IOPERM
bool "IOPERM and IOPL Emulation"
Expand Down Expand Up @@ -1994,15 +1994,15 @@ config EFI_MIXED
bool "EFI mixed-mode support"
depends on EFI_STUB && X86_64
help
Enabling this feature allows a 64-bit kernel to be booted
on a 32-bit firmware, provided that your CPU supports 64-bit
mode.
Enabling this feature allows a 64-bit kernel to be booted
on a 32-bit firmware, provided that your CPU supports 64-bit
mode.

Note that it is not possible to boot a mixed-mode enabled
kernel via the EFI boot stub - a bootloader that supports
the EFI handover protocol must be used.
Note that it is not possible to boot a mixed-mode enabled
kernel via the EFI boot stub - a bootloader that supports
the EFI handover protocol must be used.

If unsure, say N.
If unsure, say N.

source "kernel/Kconfig.hz"

Expand Down Expand Up @@ -2227,16 +2227,16 @@ config RANDOMIZE_MEMORY
select DYNAMIC_MEMORY_LAYOUT
default RANDOMIZE_BASE
help
Randomizes the base virtual address of kernel memory sections
(physical memory mapping, vmalloc & vmemmap). This security feature
makes exploits relying on predictable memory locations less reliable.
Randomizes the base virtual address of kernel memory sections
(physical memory mapping, vmalloc & vmemmap). This security feature
makes exploits relying on predictable memory locations less reliable.

The order of allocations remains unchanged. Entropy is generated in
the same way as RANDOMIZE_BASE. Current implementation in the optimal
configuration have in average 30,000 different possible virtual
addresses for each memory section.
The order of allocations remains unchanged. Entropy is generated in
the same way as RANDOMIZE_BASE. Current implementation in the optimal
configuration have in average 30,000 different possible virtual
addresses for each memory section.

If unsure, say Y.
If unsure, say Y.

config RANDOMIZE_MEMORY_PHYSICAL_PADDING
hex "Physical memory mapping padding" if EXPERT
Expand All @@ -2246,12 +2246,12 @@ config RANDOMIZE_MEMORY_PHYSICAL_PADDING
range 0x1 0x40 if MEMORY_HOTPLUG
range 0x0 0x40
help
Define the padding in terabytes added to the existing physical
memory size during kernel memory randomization. It is useful
for memory hotplug support but reduces the entropy available for
address randomization.
Define the padding in terabytes added to the existing physical
memory size during kernel memory randomization. It is useful
for memory hotplug support but reduces the entropy available for
address randomization.

If unsure, leave at the default value.
If unsure, leave at the default value.

config HOTPLUG_CPU
def_bool y
Expand Down Expand Up @@ -2598,7 +2598,6 @@ source "drivers/idle/Kconfig"

endmenu


menu "Bus options (PCI etc.)"

choice
Expand Down Expand Up @@ -2822,7 +2821,6 @@ config AMD_NB

endmenu


menu "Binary Emulations"

config IA32_EMULATION
Expand Down Expand Up @@ -2867,11 +2865,10 @@ config COMPAT_FOR_U64_ALIGNMENT
config SYSVIPC_COMPAT
def_bool y
depends on SYSVIPC
endif
endif # COMPAT

endmenu


config HAVE_ATOMIC_IOMAP
def_bool y
depends on X86_32
Expand Down

0 comments on commit 758cd94

Please sign in to comment.