Commit 3cb7e662 authored by Juerg Haefliger's avatar Juerg Haefliger Committed by Catalin Marinas

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: default avatarJuerg Haefliger <juergh@canonical.com>
Link: https://lore.kernel.org/r/20220517141648.331976-2-juergh@canonical.comSigned-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 01142791
...@@ -253,31 +253,31 @@ config ARM64_CONT_PMD_SHIFT ...@@ -253,31 +253,31 @@ config ARM64_CONT_PMD_SHIFT
default 4 default 4
config ARCH_MMAP_RND_BITS_MIN config ARCH_MMAP_RND_BITS_MIN
default 14 if ARM64_64K_PAGES default 14 if ARM64_64K_PAGES
default 16 if ARM64_16K_PAGES default 16 if ARM64_16K_PAGES
default 18 default 18
# max bits determined by the following formula: # max bits determined by the following formula:
# VA_BITS - PAGE_SHIFT - 3 # VA_BITS - PAGE_SHIFT - 3
config ARCH_MMAP_RND_BITS_MAX config ARCH_MMAP_RND_BITS_MAX
default 19 if ARM64_VA_BITS=36 default 19 if ARM64_VA_BITS=36
default 24 if ARM64_VA_BITS=39 default 24 if ARM64_VA_BITS=39
default 27 if ARM64_VA_BITS=42 default 27 if ARM64_VA_BITS=42
default 30 if ARM64_VA_BITS=47 default 30 if ARM64_VA_BITS=47
default 29 if ARM64_VA_BITS=48 && ARM64_64K_PAGES default 29 if ARM64_VA_BITS=48 && ARM64_64K_PAGES
default 31 if ARM64_VA_BITS=48 && ARM64_16K_PAGES default 31 if ARM64_VA_BITS=48 && ARM64_16K_PAGES
default 33 if ARM64_VA_BITS=48 default 33 if ARM64_VA_BITS=48
default 14 if ARM64_64K_PAGES default 14 if ARM64_64K_PAGES
default 16 if ARM64_16K_PAGES default 16 if ARM64_16K_PAGES
default 18 default 18
config ARCH_MMAP_RND_COMPAT_BITS_MIN config ARCH_MMAP_RND_COMPAT_BITS_MIN
default 7 if ARM64_64K_PAGES default 7 if ARM64_64K_PAGES
default 9 if ARM64_16K_PAGES default 9 if ARM64_16K_PAGES
default 11 default 11
config ARCH_MMAP_RND_COMPAT_BITS_MAX config ARCH_MMAP_RND_COMPAT_BITS_MAX
default 16 default 16
config NO_IOPORT_MAP config NO_IOPORT_MAP
def_bool y if !PCI def_bool y if !PCI
...@@ -304,7 +304,7 @@ config GENERIC_HWEIGHT ...@@ -304,7 +304,7 @@ config GENERIC_HWEIGHT
def_bool y def_bool y
config GENERIC_CSUM config GENERIC_CSUM
def_bool y def_bool y
config GENERIC_CALIBRATE_DELAY config GENERIC_CALIBRATE_DELAY
def_bool y def_bool y
...@@ -1037,8 +1037,7 @@ config SOCIONEXT_SYNQUACER_PREITS ...@@ -1037,8 +1037,7 @@ config SOCIONEXT_SYNQUACER_PREITS
If unsure, say Y. If unsure, say Y.
endmenu endmenu # "ARM errata workarounds via the alternatives framework"
choice choice
prompt "Page size" prompt "Page size"
...@@ -1566,9 +1565,9 @@ config SETEND_EMULATION ...@@ -1566,9 +1565,9 @@ config SETEND_EMULATION
be unexpected results in the applications. be unexpected results in the applications.
If unsure, say Y If unsure, say Y
endif endif # ARMV8_DEPRECATED
endif endif # COMPAT
menu "ARMv8.1 architectural features" menu "ARMv8.1 architectural features"
...@@ -1593,15 +1592,15 @@ config ARM64_PAN ...@@ -1593,15 +1592,15 @@ config ARM64_PAN
bool "Enable support for Privileged Access Never (PAN)" bool "Enable support for Privileged Access Never (PAN)"
default y default y
help help
Privileged Access Never (PAN; part of the ARMv8.1 Extensions) Privileged Access Never (PAN; part of the ARMv8.1 Extensions)
prevents the kernel or hypervisor from accessing user-space (EL0) prevents the kernel or hypervisor from accessing user-space (EL0)
memory directly. memory directly.
Choosing this option will cause any unprotected (not using Choosing this option will cause any unprotected (not using
copy_to_user et al) memory access to fail with a permission fault. copy_to_user et al) memory access to fail with a permission fault.
The feature is detected at runtime, and will remain as a 'nop' The feature is detected at runtime, and will remain as a 'nop'
instruction if the cpu does not implement the feature. instruction if the cpu does not implement the feature.
config AS_HAS_LDAPR config AS_HAS_LDAPR
def_bool $(as-instr,.arch_extension rcpc) def_bool $(as-instr,.arch_extension rcpc)
...@@ -1629,15 +1628,15 @@ config ARM64_USE_LSE_ATOMICS ...@@ -1629,15 +1628,15 @@ config ARM64_USE_LSE_ATOMICS
built with binutils >= 2.25 in order for the new instructions built with binutils >= 2.25 in order for the new instructions
to be used. to be used.
endmenu endmenu # "ARMv8.1 architectural features"
menu "ARMv8.2 architectural features" menu "ARMv8.2 architectural features"
config AS_HAS_ARMV8_2 config AS_HAS_ARMV8_2
def_bool $(cc-option,-Wa$(comma)-march=armv8.2-a) def_bool $(cc-option,-Wa$(comma)-march=armv8.2-a)
config AS_HAS_SHA3 config AS_HAS_SHA3
def_bool $(as-instr,.arch armv8.2-a+sha3) def_bool $(as-instr,.arch armv8.2-a+sha3)
config ARM64_PMEM config ARM64_PMEM
bool "Enable support for persistent memory" bool "Enable support for persistent memory"
...@@ -1681,7 +1680,7 @@ config ARM64_CNP ...@@ -1681,7 +1680,7 @@ config ARM64_CNP
at runtime, and does not affect PEs that do not implement at runtime, and does not affect PEs that do not implement
this feature. this feature.
endmenu endmenu # "ARMv8.2 architectural features"
menu "ARMv8.3 architectural features" menu "ARMv8.3 architectural features"
...@@ -1744,7 +1743,7 @@ config AS_HAS_PAC ...@@ -1744,7 +1743,7 @@ config AS_HAS_PAC
config AS_HAS_CFI_NEGATE_RA_STATE config AS_HAS_CFI_NEGATE_RA_STATE
def_bool $(as-instr,.cfi_startproc\n.cfi_negate_ra_state\n.cfi_endproc\n) def_bool $(as-instr,.cfi_startproc\n.cfi_negate_ra_state\n.cfi_endproc\n)
endmenu endmenu # "ARMv8.3 architectural features"
menu "ARMv8.4 architectural features" menu "ARMv8.4 architectural features"
...@@ -1785,7 +1784,7 @@ config ARM64_TLB_RANGE ...@@ -1785,7 +1784,7 @@ config ARM64_TLB_RANGE
The feature introduces new assembly instructions, and they were The feature introduces new assembly instructions, and they were
support when binutils >= 2.30. support when binutils >= 2.30.
endmenu endmenu # "ARMv8.4 architectural features"
menu "ARMv8.5 architectural features" menu "ARMv8.5 architectural features"
...@@ -1892,7 +1891,7 @@ config ARM64_MTE ...@@ -1892,7 +1891,7 @@ config ARM64_MTE
Documentation/arm64/memory-tagging-extension.rst. Documentation/arm64/memory-tagging-extension.rst.
endmenu endmenu # "ARMv8.5 architectural features"
menu "ARMv8.7 architectural features" menu "ARMv8.7 architectural features"
...@@ -1901,12 +1900,12 @@ config ARM64_EPAN ...@@ -1901,12 +1900,12 @@ config ARM64_EPAN
default y default y
depends on ARM64_PAN depends on ARM64_PAN
help help
Enhanced Privileged Access Never (EPAN) allows Privileged Enhanced Privileged Access Never (EPAN) allows Privileged
Access Never to be used with Execute-only mappings. Access Never to be used with Execute-only mappings.
The feature is detected at runtime, and will remain disabled The feature is detected at runtime, and will remain disabled
if the cpu does not implement the feature. if the cpu does not implement the feature.
endmenu endmenu # "ARMv8.7 architectural features"
config ARM64_SVE config ARM64_SVE
bool "ARM Scalable Vector Extension support" bool "ARM Scalable Vector Extension support"
...@@ -1982,7 +1981,7 @@ config ARM64_DEBUG_PRIORITY_MASKING ...@@ -1982,7 +1981,7 @@ config ARM64_DEBUG_PRIORITY_MASKING
the validity of ICC_PMR_EL1 when calling concerned functions. the validity of ICC_PMR_EL1 when calling concerned functions.
If unsure, say N If unsure, say N
endif endif # ARM64_PSEUDO_NMI
config RELOCATABLE config RELOCATABLE
bool "Build a relocatable kernel image" if EXPERT bool "Build a relocatable kernel image" if EXPERT
...@@ -2053,7 +2052,7 @@ config ARCH_NR_GPIO ...@@ -2053,7 +2052,7 @@ config ARCH_NR_GPIO
If unsure, leave the default value. If unsure, leave the default value.
endmenu endmenu # "Kernel Features"
menu "Boot options" menu "Boot options"
...@@ -2117,7 +2116,7 @@ config EFI ...@@ -2117,7 +2116,7 @@ config EFI
help help
This option provides support for runtime services provided This option provides support for runtime services provided
by UEFI firmware (such as non-volatile variables, realtime by UEFI firmware (such as non-volatile variables, realtime
clock, and platform reset). A UEFI stub is also provided to clock, and platform reset). A UEFI stub is also provided to
allow the kernel to be booted as an EFI application. This allow the kernel to be booted as an EFI application. This
is only useful on systems that have UEFI firmware. is only useful on systems that have UEFI firmware.
...@@ -2132,7 +2131,7 @@ config DMI ...@@ -2132,7 +2131,7 @@ config DMI
However, even with this option, the resultant kernel should However, even with this option, the resultant kernel should
continue to boot on existing non-UEFI platforms. continue to boot on existing non-UEFI platforms.
endmenu endmenu # "Boot options"
config SYSVIPC_COMPAT config SYSVIPC_COMPAT
def_bool y def_bool y
...@@ -2153,7 +2152,7 @@ config ARCH_HIBERNATION_HEADER ...@@ -2153,7 +2152,7 @@ config ARCH_HIBERNATION_HEADER
config ARCH_SUSPEND_POSSIBLE config ARCH_SUSPEND_POSSIBLE
def_bool y def_bool y
endmenu endmenu # "Power management options"
menu "CPU Power Management" menu "CPU Power Management"
...@@ -2161,7 +2160,7 @@ source "drivers/cpuidle/Kconfig" ...@@ -2161,7 +2160,7 @@ source "drivers/cpuidle/Kconfig"
source "drivers/cpufreq/Kconfig" source "drivers/cpufreq/Kconfig"
endmenu endmenu # "CPU Power Management"
source "drivers/acpi/Kconfig" source "drivers/acpi/Kconfig"
...@@ -2169,4 +2168,4 @@ source "arch/arm64/kvm/Kconfig" ...@@ -2169,4 +2168,4 @@ source "arch/arm64/kvm/Kconfig"
if CRYPTO if CRYPTO
source "arch/arm64/crypto/Kconfig" source "arch/arm64/crypto/Kconfig"
endif endif # CRYPTO
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment