diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:35:58 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:35:58 +0100 |
| commit | ad569b70aa02ffba1e86411b79570cbe4e6c7bb8 (patch) | |
| tree | e7cb9d5b58e9421d7a5840fe97fcb2f740de216d /arch/arm64/kvm/arm.c | |
| parent | 3d63ef4d523edb365dd6c91464ccc18e7bda510d (diff) | |
| parent | 85d703746154cdc6794b6654b587b0b0354c97e9 (diff) | |
Merge branch 'kvm-arm64/misc-5.13' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/arm.c')
| -rw-r--r-- | arch/arm64/kvm/arm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 3f98dbe09500..74acc4444d48 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1881,8 +1881,10 @@ static int init_hyp_mode(void) if (is_protected_kvm_enabled()) { init_cpu_logical_map(); - if (!init_psci_relay()) + if (!init_psci_relay()) { + err = -ENODEV; goto out_err; + } } if (is_protected_kvm_enabled()) { |