aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/arm64/Kconfig
diff options
context:
space:
mode:
authorMarc Zyngier <maz@kernel.org>2020-07-28 16:02:21 +0100
committerMarc Zyngier <maz@kernel.org>2020-07-28 16:02:21 +0100
commitfc279329a8aecfee50e010312c2dc373ab6810fb (patch)
treee16127c295734e861b64ba72aa24d906e1460251 /arch/arm64/Kconfig
parentMerge branch 'kvm-arm64/pre-nv-5.9' into kvmarm-master/next-WIP (diff)
parentKVM: arm64: Simplify PtrAuth alternative patching (diff)
downloadwireguard-linux-fc279329a8aecfee50e010312c2dc373ab6810fb.tar.xz
wireguard-linux-fc279329a8aecfee50e010312c2dc373ab6810fb.zip
Merge branch 'kvm-arm64/ptrauth-nvhe' into kvmarm-master/next-WIP
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/Kconfig')
-rw-r--r--arch/arm64/Kconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 66dc41fd49f2..27cfac561745 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1516,7 +1516,6 @@ menu "ARMv8.3 architectural features"
config ARM64_PTR_AUTH
bool "Enable support for pointer authentication"
default y
- depends on !KVM || ARM64_VHE
depends on (CC_HAS_SIGN_RETURN_ADDRESS || CC_HAS_BRANCH_PROT_PAC_RET) && AS_HAS_PAC
# Modern compilers insert a .note.gnu.property section note for PAC
# which is only understood by binutils starting with version 2.33.1.
@@ -1543,8 +1542,7 @@ config ARM64_PTR_AUTH
The feature is detected at runtime. If the feature is not present in
hardware it will not be advertised to userspace/KVM guest nor will it
- be enabled. However, KVM guest also require VHE mode and hence
- CONFIG_ARM64_VHE=y option to use this feature.
+ be enabled.
If the feature is present on the boot CPU but not on a late CPU, then
the late CPU will be parked. Also, if the boot CPU does not have