KVM/x86: Remove superfluous SMP function call

[deliverable/linux.git] / arch / x86 / kvm / x86.c

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 902d9da123929be3b8a02e2acc3f315d71c80c2a..6f90595fdd64da02ab27fb5f03148992f9085699 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1244,12 +1244,6 @@ static atomic_t kvm_guest_has_master_clock = ATOMIC_INIT(0);
 static DEFINE_PER_CPU(unsigned long, cpu_tsc_khz);
 static unsigned long max_tsc_khz;
 
-static inline u64 nsec_to_cycles(struct kvm_vcpu *vcpu, u64 nsec)
-{
-       return pvclock_scale_delta(nsec, vcpu->arch.virtual_tsc_mult,
-                                  vcpu->arch.virtual_tsc_shift);
-}
-
 static u32 adjust_tsc_khz(u32 khz, s32 ppm)
 {
        u64 v = (u64)khz * (1000000 + ppm);
@@ -5668,15 +5662,13 @@ static struct notifier_block kvmclock_cpufreq_notifier_block = {
 static int kvmclock_cpu_notifier(struct notifier_block *nfb,
                                        unsigned long action, void *hcpu)
 {
-       unsigned int cpu = (unsigned long)hcpu;
-
        switch (action) {
                case CPU_ONLINE:
                case CPU_DOWN_FAILED:
-                       smp_call_function_single(cpu, tsc_khz_changed, NULL, 1);
+                       tsc_khz_changed(NULL);
                        break;
                case CPU_DOWN_PREPARE:
-                       smp_call_function_single(cpu, tsc_bad, NULL, 1);
+                       tsc_bad(NULL);
                        break;
        }
        return NOTIFY_OK;