From: Paolo Bonzini <pbonzini@redhat.com>
Date: Sun, 6 Oct 2024 07:59:22 +0000 (-0400)
Subject: Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=c8d430db8eec7d4fd13a6bea27b7086a54eda6da;p=linux.git

Merge tag 'kvmarm-fixes-6.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm64 fixes for 6.12, take #1

- Fix pKVM error path on init, making sure we do not change critical
  system registers as we're about to fail

- Make sure that the host's vector length is at capped by a value
  common to all CPUs

- Fix kvm_has_feat*() handling of "negative" features, as the current
  code is pretty broken

- Promote Joey to the status of official reviewer, while James steps
  down -- hopefully only temporarly
---

c8d430db8eec7d4fd13a6bea27b7086a54eda6da
diff --cc arch/x86/include/asm/reboot.h
index 2d8525a51478,c02183d3cdd7..ecd58ea9a837
--- a/arch/x86/include/asm/reboot.h
+++ b/arch/x86/include/asm/reboot.h
@@@ -31,8 -31,10 +31,10 @@@ void cpu_emergency_register_virt_callba
  void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback);
  void cpu_emergency_disable_virtualization(void);
  #else
+ static inline void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback) {}
+ static inline void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback) {}
  static inline void cpu_emergency_disable_virtualization(void) {}
 -#endif /* CONFIG_KVM_INTEL || CONFIG_KVM_AMD */
 +#endif /* CONFIG_KVM_X86 */
  
  typedef void (*nmi_shootdown_cb)(int, struct pt_regs*);
  void nmi_shootdown_cpus(nmi_shootdown_cb callback);