From: Marc Zyngier <maz@kernel.org>
Date: Thu, 3 Dec 2020 19:12:24 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/kvm-arm64/csv3' into kvmarm-master/queue
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f86e54653e67171a7cc0f85e0fe5766deb310e03;p=linux.git

Merge remote-tracking branch 'origin/kvm-arm64/csv3' into kvmarm-master/queue

Signed-off-by: Marc Zyngier <maz@kernel.org>
---

f86e54653e67171a7cc0f85e0fe5766deb310e03
diff --cc arch/arm64/include/asm/spectre.h
index 4e6d90a4fbe07,52e788981f4a2..f62ca39da6c5a
--- a/arch/arm64/include/asm/spectre.h
+++ b/arch/arm64/include/asm/spectre.h
@@@ -91,5 -29,6 +91,7 @@@ bool has_spectre_v4(const struct arm64_
  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 */