Skip to content

Commit 758cd94

Browse files
juerghIngo Molnar
authored andcommitted
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 <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 6f3f04c commit 758cd94

File tree

1 file changed

+49
-52
lines changed

1 file changed

+49
-52
lines changed

arch/x86/Kconfig

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ config FORCE_DYNAMIC_FTRACE
4141
depends on FUNCTION_TRACER
4242
select DYNAMIC_FTRACE
4343
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.
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.
4949
#
5050
# Arch settings
5151
#
@@ -392,9 +392,9 @@ config CC_HAS_SANE_STACKPROTECTOR
392392
default $(success,$(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC)) if 64BIT
393393
default $(success,$(srctree)/scripts/gcc-x86_32-has-stack-protector.sh $(CC))
394394
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.
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.
398398

399399
menu "Processor type and features"
400400

@@ -530,7 +530,7 @@ config X86_EXTENDED_PLATFORM
530530

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

535535
if X86_64
536536
config X86_EXTENDED_PLATFORM
@@ -549,7 +549,7 @@ config X86_EXTENDED_PLATFORM
549549

550550
If you have one of these systems, or if you want to build a
551551
generic distribution kernel, say Y here - otherwise say N.
552-
endif
552+
endif # X86_64
553553
# This is an alphabetically sorted list of 64 bit extended platforms
554554
# Please maintain the alphabetic order if and when there are additions
555555
config X86_NUMACHIP
@@ -597,9 +597,9 @@ config X86_GOLDFISH
597597
bool "Goldfish (Virtual Platform)"
598598
depends on X86_EXTENDED_PLATFORM
599599
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.
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.
603603

604604
config X86_INTEL_CE
605605
bool "CE4100 TV platform"
@@ -898,7 +898,7 @@ config INTEL_TDX_GUEST
898898
memory contents and CPU state. TDX guests are protected from
899899
some attacks from the VMM.
900900

901-
endif #HYPERVISOR_GUEST
901+
endif # HYPERVISOR_GUEST
902902

903903
source "arch/x86/Kconfig.cpu"
904904

@@ -1159,16 +1159,16 @@ config X86_MCE_INTEL
11591159
prompt "Intel MCE features"
11601160
depends on X86_MCE && X86_LOCAL_APIC
11611161
help
1162-
Additional support for intel specific MCE features such as
1163-
the thermal monitor.
1162+
Additional support for intel specific MCE features such as
1163+
the thermal monitor.
11641164

11651165
config X86_MCE_AMD
11661166
def_bool y
11671167
prompt "AMD MCE features"
11681168
depends on X86_MCE && X86_LOCAL_APIC && AMD_NB
11691169
help
1170-
Additional support for AMD specific MCE features such as
1171-
the DRAM Error Threshold.
1170+
Additional support for AMD specific MCE features such as
1171+
the DRAM Error Threshold.
11721172

11731173
config X86_ANCIENT_MCE
11741174
bool "Support for old Pentium 5 / WinChip machine checks"
@@ -1246,18 +1246,18 @@ config X86_VSYSCALL_EMULATION
12461246
default y
12471247
depends on X86_64
12481248
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.
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.
12551255

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.
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.
12581258

1259-
Disabling this option saves about 7K of kernel size and
1260-
possibly 4K of additional runtime pagetable memory.
1259+
Disabling this option saves about 7K of kernel size and
1260+
possibly 4K of additional runtime pagetable memory.
12611261

12621262
config X86_IOPL_IOPERM
12631263
bool "IOPERM and IOPL Emulation"
@@ -1994,15 +1994,15 @@ config EFI_MIXED
19941994
bool "EFI mixed-mode support"
19951995
depends on EFI_STUB && X86_64
19961996
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.
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.
20002000

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.
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.
20042004

2005-
If unsure, say N.
2005+
If unsure, say N.
20062006

20072007
source "kernel/Kconfig.hz"
20082008

@@ -2227,16 +2227,16 @@ config RANDOMIZE_MEMORY
22272227
select DYNAMIC_MEMORY_LAYOUT
22282228
default RANDOMIZE_BASE
22292229
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.
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.
22332233

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.
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.
22382238

2239-
If unsure, say Y.
2239+
If unsure, say Y.
22402240

22412241
config RANDOMIZE_MEMORY_PHYSICAL_PADDING
22422242
hex "Physical memory mapping padding" if EXPERT
@@ -2246,12 +2246,12 @@ config RANDOMIZE_MEMORY_PHYSICAL_PADDING
22462246
range 0x1 0x40 if MEMORY_HOTPLUG
22472247
range 0x0 0x40
22482248
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.
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.
22532253

2254-
If unsure, leave at the default value.
2254+
If unsure, leave at the default value.
22552255

22562256
config HOTPLUG_CPU
22572257
def_bool y
@@ -2598,7 +2598,6 @@ source "drivers/idle/Kconfig"
25982598

25992599
endmenu
26002600

2601-
26022601
menu "Bus options (PCI etc.)"
26032602

26042603
choice
@@ -2822,7 +2821,6 @@ config AMD_NB
28222821

28232822
endmenu
28242823

2825-
28262824
menu "Binary Emulations"
28272825

28282826
config IA32_EMULATION
@@ -2867,11 +2865,10 @@ config COMPAT_FOR_U64_ALIGNMENT
28672865
config SYSVIPC_COMPAT
28682866
def_bool y
28692867
depends on SYSVIPC
2870-
endif
2868+
endif # COMPAT
28712869

28722870
endmenu
28732871

2874-
28752872
config HAVE_ATOMIC_IOMAP
28762873
def_bool y
28772874
depends on X86_32

0 commit comments

Comments
 (0)