Skip to content

Commit 3cb7e66

Browse files
juerghctmarinas
authored andcommitted
arm64: Kconfig: Fix indentation and add comments
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 trailing comments to endif and endmenu statements for better readability. Signed-off-by: Juerg Haefliger <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 0114279 commit 3cb7e66

File tree

1 file changed

+47
-48
lines changed

1 file changed

+47
-48
lines changed

arch/arm64/Kconfig

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -253,31 +253,31 @@ config ARM64_CONT_PMD_SHIFT
253253
default 4
254254

255255
config ARCH_MMAP_RND_BITS_MIN
256-
default 14 if ARM64_64K_PAGES
257-
default 16 if ARM64_16K_PAGES
258-
default 18
256+
default 14 if ARM64_64K_PAGES
257+
default 16 if ARM64_16K_PAGES
258+
default 18
259259

260260
# max bits determined by the following formula:
261261
# VA_BITS - PAGE_SHIFT - 3
262262
config ARCH_MMAP_RND_BITS_MAX
263-
default 19 if ARM64_VA_BITS=36
264-
default 24 if ARM64_VA_BITS=39
265-
default 27 if ARM64_VA_BITS=42
266-
default 30 if ARM64_VA_BITS=47
267-
default 29 if ARM64_VA_BITS=48 && ARM64_64K_PAGES
268-
default 31 if ARM64_VA_BITS=48 && ARM64_16K_PAGES
269-
default 33 if ARM64_VA_BITS=48
270-
default 14 if ARM64_64K_PAGES
271-
default 16 if ARM64_16K_PAGES
272-
default 18
263+
default 19 if ARM64_VA_BITS=36
264+
default 24 if ARM64_VA_BITS=39
265+
default 27 if ARM64_VA_BITS=42
266+
default 30 if ARM64_VA_BITS=47
267+
default 29 if ARM64_VA_BITS=48 && ARM64_64K_PAGES
268+
default 31 if ARM64_VA_BITS=48 && ARM64_16K_PAGES
269+
default 33 if ARM64_VA_BITS=48
270+
default 14 if ARM64_64K_PAGES
271+
default 16 if ARM64_16K_PAGES
272+
default 18
273273

274274
config ARCH_MMAP_RND_COMPAT_BITS_MIN
275-
default 7 if ARM64_64K_PAGES
276-
default 9 if ARM64_16K_PAGES
277-
default 11
275+
default 7 if ARM64_64K_PAGES
276+
default 9 if ARM64_16K_PAGES
277+
default 11
278278

279279
config ARCH_MMAP_RND_COMPAT_BITS_MAX
280-
default 16
280+
default 16
281281

282282
config NO_IOPORT_MAP
283283
def_bool y if !PCI
@@ -304,7 +304,7 @@ config GENERIC_HWEIGHT
304304
def_bool y
305305

306306
config GENERIC_CSUM
307-
def_bool y
307+
def_bool y
308308

309309
config GENERIC_CALIBRATE_DELAY
310310
def_bool y
@@ -1037,8 +1037,7 @@ config SOCIONEXT_SYNQUACER_PREITS
10371037

10381038
If unsure, say Y.
10391039

1040-
endmenu
1041-
1040+
endmenu # "ARM errata workarounds via the alternatives framework"
10421041

10431042
choice
10441043
prompt "Page size"
@@ -1566,9 +1565,9 @@ config SETEND_EMULATION
15661565
be unexpected results in the applications.
15671566

15681567
If unsure, say Y
1569-
endif
1568+
endif # ARMV8_DEPRECATED
15701569

1571-
endif
1570+
endif # COMPAT
15721571

15731572
menu "ARMv8.1 architectural features"
15741573

@@ -1593,15 +1592,15 @@ config ARM64_PAN
15931592
bool "Enable support for Privileged Access Never (PAN)"
15941593
default y
15951594
help
1596-
Privileged Access Never (PAN; part of the ARMv8.1 Extensions)
1597-
prevents the kernel or hypervisor from accessing user-space (EL0)
1598-
memory directly.
1595+
Privileged Access Never (PAN; part of the ARMv8.1 Extensions)
1596+
prevents the kernel or hypervisor from accessing user-space (EL0)
1597+
memory directly.
15991598

1600-
Choosing this option will cause any unprotected (not using
1601-
copy_to_user et al) memory access to fail with a permission fault.
1599+
Choosing this option will cause any unprotected (not using
1600+
copy_to_user et al) memory access to fail with a permission fault.
16021601

1603-
The feature is detected at runtime, and will remain as a 'nop'
1604-
instruction if the cpu does not implement the feature.
1602+
The feature is detected at runtime, and will remain as a 'nop'
1603+
instruction if the cpu does not implement the feature.
16051604

16061605
config AS_HAS_LDAPR
16071606
def_bool $(as-instr,.arch_extension rcpc)
@@ -1629,15 +1628,15 @@ config ARM64_USE_LSE_ATOMICS
16291628
built with binutils >= 2.25 in order for the new instructions
16301629
to be used.
16311630

1632-
endmenu
1631+
endmenu # "ARMv8.1 architectural features"
16331632

16341633
menu "ARMv8.2 architectural features"
16351634

16361635
config AS_HAS_ARMV8_2
1637-
def_bool $(cc-option,-Wa$(comma)-march=armv8.2-a)
1636+
def_bool $(cc-option,-Wa$(comma)-march=armv8.2-a)
16381637

16391638
config AS_HAS_SHA3
1640-
def_bool $(as-instr,.arch armv8.2-a+sha3)
1639+
def_bool $(as-instr,.arch armv8.2-a+sha3)
16411640

16421641
config ARM64_PMEM
16431642
bool "Enable support for persistent memory"
@@ -1681,7 +1680,7 @@ config ARM64_CNP
16811680
at runtime, and does not affect PEs that do not implement
16821681
this feature.
16831682

1684-
endmenu
1683+
endmenu # "ARMv8.2 architectural features"
16851684

16861685
menu "ARMv8.3 architectural features"
16871686

@@ -1744,7 +1743,7 @@ config AS_HAS_PAC
17441743
config AS_HAS_CFI_NEGATE_RA_STATE
17451744
def_bool $(as-instr,.cfi_startproc\n.cfi_negate_ra_state\n.cfi_endproc\n)
17461745

1747-
endmenu
1746+
endmenu # "ARMv8.3 architectural features"
17481747

17491748
menu "ARMv8.4 architectural features"
17501749

@@ -1785,7 +1784,7 @@ config ARM64_TLB_RANGE
17851784
The feature introduces new assembly instructions, and they were
17861785
support when binutils >= 2.30.
17871786

1788-
endmenu
1787+
endmenu # "ARMv8.4 architectural features"
17891788

17901789
menu "ARMv8.5 architectural features"
17911790

@@ -1892,7 +1891,7 @@ config ARM64_MTE
18921891

18931892
Documentation/arm64/memory-tagging-extension.rst.
18941893

1895-
endmenu
1894+
endmenu # "ARMv8.5 architectural features"
18961895

18971896
menu "ARMv8.7 architectural features"
18981897

@@ -1901,12 +1900,12 @@ config ARM64_EPAN
19011900
default y
19021901
depends on ARM64_PAN
19031902
help
1904-
Enhanced Privileged Access Never (EPAN) allows Privileged
1905-
Access Never to be used with Execute-only mappings.
1903+
Enhanced Privileged Access Never (EPAN) allows Privileged
1904+
Access Never to be used with Execute-only mappings.
19061905

1907-
The feature is detected at runtime, and will remain disabled
1908-
if the cpu does not implement the feature.
1909-
endmenu
1906+
The feature is detected at runtime, and will remain disabled
1907+
if the cpu does not implement the feature.
1908+
endmenu # "ARMv8.7 architectural features"
19101909

19111910
config ARM64_SVE
19121911
bool "ARM Scalable Vector Extension support"
@@ -1982,7 +1981,7 @@ config ARM64_DEBUG_PRIORITY_MASKING
19821981
the validity of ICC_PMR_EL1 when calling concerned functions.
19831982

19841983
If unsure, say N
1985-
endif
1984+
endif # ARM64_PSEUDO_NMI
19861985

19871986
config RELOCATABLE
19881987
bool "Build a relocatable kernel image" if EXPERT
@@ -2053,7 +2052,7 @@ config ARCH_NR_GPIO
20532052

20542053
If unsure, leave the default value.
20552054

2056-
endmenu
2055+
endmenu # "Kernel Features"
20572056

20582057
menu "Boot options"
20592058

@@ -2117,7 +2116,7 @@ config EFI
21172116
help
21182117
This option provides support for runtime services provided
21192118
by UEFI firmware (such as non-volatile variables, realtime
2120-
clock, and platform reset). A UEFI stub is also provided to
2119+
clock, and platform reset). A UEFI stub is also provided to
21212120
allow the kernel to be booted as an EFI application. This
21222121
is only useful on systems that have UEFI firmware.
21232122

@@ -2132,7 +2131,7 @@ config DMI
21322131
However, even with this option, the resultant kernel should
21332132
continue to boot on existing non-UEFI platforms.
21342133

2135-
endmenu
2134+
endmenu # "Boot options"
21362135

21372136
config SYSVIPC_COMPAT
21382137
def_bool y
@@ -2153,20 +2152,20 @@ config ARCH_HIBERNATION_HEADER
21532152
config ARCH_SUSPEND_POSSIBLE
21542153
def_bool y
21552154

2156-
endmenu
2155+
endmenu # "Power management options"
21572156

21582157
menu "CPU Power Management"
21592158

21602159
source "drivers/cpuidle/Kconfig"
21612160

21622161
source "drivers/cpufreq/Kconfig"
21632162

2164-
endmenu
2163+
endmenu # "CPU Power Management"
21652164

21662165
source "drivers/acpi/Kconfig"
21672166

21682167
source "arch/arm64/kvm/Kconfig"
21692168

21702169
if CRYPTO
21712170
source "arch/arm64/crypto/Kconfig"
2172-
endif
2171+
endif # CRYPTO

0 commit comments

Comments
 (0)