diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-12-03 19:12:24 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-12-03 19:12:24 +0000 |
| commit | f86e54653e67171a7cc0f85e0fe5766deb310e03 (patch) | |
| tree | b2be5165cb614be0199c71f703a27b1019481428 /arch/arm64/include | |
| parent | 90f0e16c649ac3e93094cb491072d6424f53be43 (diff) | |
| parent | 4f1df628d4ec22b04f67e068e6d02538d3dd557b (diff) | |
Merge remote-tracking branch 'origin/kvm-arm64/csv3' into kvmarm-master/queue
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include')
| -rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 1 | ||||
| -rw-r--r-- | arch/arm64/include/asm/spectre.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index d254c7794bfa..21ce5c420247 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -121,6 +121,7 @@ struct kvm_arch { unsigned int pmuver; u8 pfr0_csv2; + u8 pfr0_csv3; }; struct kvm_vcpu_fault_info { diff --git a/arch/arm64/include/asm/spectre.h b/arch/arm64/include/asm/spectre.h index 4e6d90a4fbe0..f62ca39da6c5 100644 --- a/arch/arm64/include/asm/spectre.h +++ b/arch/arm64/include/asm/spectre.h @@ -91,5 +91,7 @@ bool has_spectre_v4(const struct arm64_cpu_capabilities *cap, int scope); void spectre_v4_enable_mitigation(const struct arm64_cpu_capabilities *__unused); void spectre_v4_enable_task_mitigation(struct task_struct *tsk); +enum mitigation_state arm64_get_meltdown_state(void); + #endif /* __ASSEMBLY__ */ #endif /* __ASM_SPECTRE_H */ |