Explorar o código

x86: KVM geust: make setup_secondary_clock definition dependent on local apic

Since the pv_apic_ops are only present if CONFIG_X86_LOCAL_APIC is compiled
in, kvmclock failed to build without this option.  This patch fixes this.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Glauber Costa %!s(int64=17) %!d(string=hai) anos
pai
achega
b8ba5f10c5
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      arch/x86/kernel/kvmclock.c

+ 4 - 0
arch/x86/kernel/kvmclock.c

@@ -133,6 +133,7 @@ static int kvm_register_clock(void)
 	return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high);
 	return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high);
 }
 }
 
 
+#ifdef CONFIG_X86_LOCAL_APIC
 static void kvm_setup_secondary_clock(void)
 static void kvm_setup_secondary_clock(void)
 {
 {
 	/*
 	/*
@@ -143,6 +144,7 @@ static void kvm_setup_secondary_clock(void)
 	/* ok, done with our trickery, call native */
 	/* ok, done with our trickery, call native */
 	setup_secondary_APIC_clock();
 	setup_secondary_APIC_clock();
 }
 }
+#endif
 
 
 /*
 /*
  * After the clock is registered, the host will keep writing to the
  * After the clock is registered, the host will keep writing to the
@@ -177,7 +179,9 @@ void __init kvmclock_init(void)
 		pv_time_ops.get_wallclock = kvm_get_wallclock;
 		pv_time_ops.get_wallclock = kvm_get_wallclock;
 		pv_time_ops.set_wallclock = kvm_set_wallclock;
 		pv_time_ops.set_wallclock = kvm_set_wallclock;
 		pv_time_ops.sched_clock = kvm_clock_read;
 		pv_time_ops.sched_clock = kvm_clock_read;
+#ifdef CONFIG_X86_LOCAL_APIC
 		pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock;
 		pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock;
+#endif
 		machine_ops.shutdown  = kvm_shutdown;
 		machine_ops.shutdown  = kvm_shutdown;
 #ifdef CONFIG_KEXEC
 #ifdef CONFIG_KEXEC
 		machine_ops.crash_shutdown  = kvm_crash_shutdown;
 		machine_ops.crash_shutdown  = kvm_crash_shutdown;