Skip to content

Commit 6d55a94

Browse files
sean-jcbonzini
authored andcommitted
x86/reboot: Unconditionally define cpu_emergency_virt_cb typedef
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 <[email protected]> Reviewed-by: Chao Gao <[email protected]> Reviewed-by: Kai Huang <[email protected]> Tested-by: Farrah Chen <[email protected]> Signed-off-by: Sean Christopherson <[email protected]> Message-ID: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent b67107a commit 6d55a94

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/include/asm/reboot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ void __noreturn machine_real_restart(unsigned int type);
2525
#define MRR_BIOS 0
2626
#define MRR_APM 1
2727

28-
#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD)
2928
typedef void (cpu_emergency_virt_cb)(void);
29+
#if IS_ENABLED(CONFIG_KVM_INTEL) || IS_ENABLED(CONFIG_KVM_AMD)
3030
void cpu_emergency_register_virt_callback(cpu_emergency_virt_cb *callback);
3131
void cpu_emergency_unregister_virt_callback(cpu_emergency_virt_cb *callback);
3232
void cpu_emergency_disable_virtualization(void);

0 commit comments

Comments
 (0)