diff options
| author | Stafford Horne <shorne@gmail.com> | 2021-01-25 03:08:34 +0100 |
|---|---|---|
| committer | Stafford Horne <shorne@gmail.com> | 2021-01-25 03:16:06 +0100 |
| commit | 2261352157a932717ec08b9dd18d1bfbb7c37c52 (patch) | |
| tree | b48a3ea4060a7d078aecb97de07597a8eb24467a /arch/arm64/kernel/cpufeature.c | |
| parent | drivers/soc/litex: Add restart handler (diff) | |
| parent | openrisc: io: Add missing __iomem annotation to iounmap() (diff) | |
| download | linux-2261352157a932717ec08b9dd18d1bfbb7c37c52.tar.xz linux-2261352157a932717ec08b9dd18d1bfbb7c37c52.zip | |
Merge remote-tracking branch 'openrisc/or1k-5.11-fixes' into or1k-5.12-updates
Pickup fixes that went upstream already in order to resolve conflicts in
litex_soc_ctrl.c between 5.11 fixes that went upstream and the
or1k-5.12-updates linux-next queue.
Signed-off-by: Stafford Horne <shorne@gmail.com>
Diffstat (limited to 'arch/arm64/kernel/cpufeature.c')
| -rw-r--r-- | arch/arm64/kernel/cpufeature.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 7ffb5f1d8b68..e99eddec0a46 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c @@ -2568,7 +2568,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); |