diff options
| author | Will Deacon <will@kernel.org> | 2020-05-05 17:45:17 +0200 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-05-16 16:04:18 +0200 |
| commit | d82755b2e781c8989614c82df7582f5649e265b8 (patch) | |
| tree | 4f5fec416fd7358215632968555b45f798bf5bfd /arch/arm64/kernel/cpu_errata.c | |
| parent | KVM: arm64: Move virt/kvm/arm to arch/arm64 (diff) | |
| download | linux-d82755b2e781c8989614c82df7582f5649e265b8.tar.xz linux-d82755b2e781c8989614c82df7582f5649e265b8.zip | |
KVM: arm64: Kill off CONFIG_KVM_ARM_HOST
CONFIG_KVM_ARM_HOST is just a proxy for CONFIG_KVM, so remove it in favour
of the latter.
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Fuad Tabba <tabba@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200505154520.194120-2-tabba@google.com
Diffstat (limited to 'arch/arm64/kernel/cpu_errata.c')
| -rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index df56d2295d16..a102321fc8a2 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -234,7 +234,7 @@ static int detect_harden_bp_fw(void) smccc_end = NULL; break; -#if IS_ENABLED(CONFIG_KVM_ARM_HOST) +#if IS_ENABLED(CONFIG_KVM) case SMCCC_CONDUIT_SMC: cb = call_smc_arch_workaround_1; smccc_start = __smccc_workaround_1_smc; |