]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
x86/reboot: Unconditionally define cpu_emergency_virt_cb typedef
authorSean Christopherson <seanjc@google.com>
Fri, 30 Aug 2024 04:35:59 +0000 (21:35 -0700)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 4 Sep 2024 15:02:34 +0000 (11:02 -0400)
Define cpu_emergency_virt_cb even if the kernel is being built without KVM
support so that KVM can reference the typedef in asm/kvm_host.h without
needing yet more #ifdefs.

No functional change intended.

Acked-by: Kai Huang <kai.huang@intel.com>
Reviewed-by: Chao Gao <chao.gao@intel.com>
Reviewed-by: Kai Huang <kai.huang@intel.com>
Tested-by: Farrah Chen <farrah.chen@intel.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-ID: <20240830043600.127750-10-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/include/asm/reboot.h

index 6536873f8fc0a2fc748070ab1834d1b97db70386..d0ef2a678d66c02d6bdcc4807b15f9b61bfdde9a 100644 (file)
@@ -25,8 +25,8 @@ void __noreturn machine_real_restart(unsigned int type);
 #define MRR_BIOS       0
 #define MRR_APM                1
 
-#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD)
 typedef void (cpu_emergency_virt_cb)(void);
+#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD)
 void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback);
 void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback);
 void cpu_emergency_disable_virtualization(void);