OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8cbebc4
)
arm64: cpufeature: remove non-exist CONFIG_KVM_ARM_HOST
author
Shannon Zhao
<shannon.zhao@linux.alibaba.com>
Mon, 4 Jan 2021 11:38:44 +0000
(19:38 +0800)
committer
Marc Zyngier
<maz@kernel.org>
Tue, 5 Jan 2021 13:22:07 +0000
(13:22 +0000)
Commit
d82755b2e781
("KVM: arm64: Kill off CONFIG_KVM_ARM_HOST") deletes
CONFIG_KVM_ARM_HOST option, it should use CONFIG_KVM instead.
Just remove CONFIG_KVM_ARM_HOST here.
Fixes:
d82755b2e781
("KVM: arm64: Kill off CONFIG_KVM_ARM_HOST")
Signed-off-by: Shannon Zhao <shannon.zhao@linux.alibaba.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link:
https://lore.kernel.org/r/1609760324-92271-1-git-send-email-shannon.zhao@linux.alibaba.com
arch/arm64/kernel/cpufeature.c
patch
|
blob
|
history
diff --git
a/arch/arm64/kernel/cpufeature.c
b/arch/arm64/kernel/cpufeature.c
index
d96f455
..
bc35496
100644
(file)
--- a/
arch/arm64/kernel/cpufeature.c
+++ b/
arch/arm64/kernel/cpufeature.c
@@
-2558,7
+2558,7
@@
static void verify_hyp_capabilities(void)
int parange, ipa_max;
unsigned int safe_vmid_bits, vmid_bits;
- if (!IS_ENABLED(CONFIG_KVM)
|| !IS_ENABLED(CONFIG_KVM_ARM_HOST)
)
+ if (!IS_ENABLED(CONFIG_KVM))
return;
safe_mmfr1 = read_sanitised_ftr_reg(SYS_ID_AA64MMFR1_EL1);