diff options
author | Marc Zyngier <maz@kernel.org> | 2020-09-30 14:05:35 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2020-09-30 14:05:35 +0100 |
commit | 14ef9d04928b61d699fd0dd858b14b5d8150113e (patch) | |
tree | 267d772b7068f7d0da04cf421286c65f2599f472 /arch/arm64/kernel/hibernate.c | |
parent | Merge branch 'kvm-arm64/pmu-5.9' into kvmarm-master/next (diff) | |
parent | Merge remote-tracking branch 'arm64/for-next/ghostbusters' into kvm-arm64/hyp-pcpu (diff) | |
download | linux-dev-14ef9d04928b61d699fd0dd858b14b5d8150113e.tar.xz linux-dev-14ef9d04928b61d699fd0dd858b14b5d8150113e.zip |
Merge branch 'kvm-arm64/hyp-pcpu' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/hibernate.c')
-rw-r--r-- | arch/arm64/kernel/hibernate.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 68e14152d6e9..c7b00120dc3e 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -332,11 +332,7 @@ int swsusp_arch_suspend(void) * mitigation off behind our back, let's set the state * to what we expect it to be. */ - switch (arm64_get_ssbd_state()) { - case ARM64_SSBD_FORCE_ENABLE: - case ARM64_SSBD_KERNEL: - arm64_set_ssbd_mitigation(true); - } + spectre_v4_enable_mitigation(NULL); } local_daif_restore(flags); |