diff options
| -rw-r--r-- | arch/x86/kernel/kvmclock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/kvmclock.c b/arch/x86/kernel/kvmclock.c index ddee04043aeb..4bc1be5d5472 100644 --- a/arch/x86/kernel/kvmclock.c +++ b/arch/x86/kernel/kvmclock.c | |||
| @@ -133,6 +133,7 @@ static int kvm_register_clock(void) | |||
| 133 | return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high); | 133 | return native_write_msr_safe(MSR_KVM_SYSTEM_TIME, low, high); |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 136 | static void kvm_setup_secondary_clock(void) | 137 | static void kvm_setup_secondary_clock(void) |
| 137 | { | 138 | { |
| 138 | /* | 139 | /* |
| @@ -143,6 +144,7 @@ static void kvm_setup_secondary_clock(void) | |||
| 143 | /* ok, done with our trickery, call native */ | 144 | /* ok, done with our trickery, call native */ |
| 144 | setup_secondary_APIC_clock(); | 145 | setup_secondary_APIC_clock(); |
| 145 | } | 146 | } |
| 147 | #endif | ||
| 146 | 148 | ||
| 147 | /* | 149 | /* |
| 148 | * After the clock is registered, the host will keep writing to the | 150 | * After the clock is registered, the host will keep writing to the |
| @@ -177,7 +179,9 @@ void __init kvmclock_init(void) | |||
| 177 | pv_time_ops.get_wallclock = kvm_get_wallclock; | 179 | pv_time_ops.get_wallclock = kvm_get_wallclock; |
| 178 | pv_time_ops.set_wallclock = kvm_set_wallclock; | 180 | pv_time_ops.set_wallclock = kvm_set_wallclock; |
| 179 | pv_time_ops.sched_clock = kvm_clock_read; | 181 | pv_time_ops.sched_clock = kvm_clock_read; |
| 182 | #ifdef CONFIG_X86_LOCAL_APIC | ||
| 180 | pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock; | 183 | pv_apic_ops.setup_secondary_clock = kvm_setup_secondary_clock; |
| 184 | #endif | ||
| 181 | machine_ops.shutdown = kvm_shutdown; | 185 | machine_ops.shutdown = kvm_shutdown; |
| 182 | #ifdef CONFIG_KEXEC | 186 | #ifdef CONFIG_KEXEC |
| 183 | machine_ops.crash_shutdown = kvm_crash_shutdown; | 187 | machine_ops.crash_shutdown = kvm_crash_shutdown; |
