]> err.no Git - linux-2.6/blobdiff - arch/x86/kernel/vmi_32.c
Merge branch 'linus' into tracing/urgent
[linux-2.6] / arch / x86 / kernel / vmi_32.c
index 946bf13b44abf9be798df19449edff6804efe43d..0a1b1a9d922df7f4380a40d4b210330dbc8db17a 100644 (file)
@@ -906,7 +906,6 @@ static inline int __init activate_vmi(void)
 #ifdef CONFIG_X86_LOCAL_APIC
        para_fill(pv_apic_ops.apic_read, APICRead);
        para_fill(pv_apic_ops.apic_write, APICWrite);
-       para_fill(pv_apic_ops.apic_write_atomic, APICWrite);
 #endif
 
        /*
@@ -932,7 +931,7 @@ static inline int __init activate_vmi(void)
                pv_apic_ops.setup_secondary_clock = vmi_time_ap_init;
 #endif
                pv_time_ops.sched_clock = vmi_sched_clock;
-               pv_time_ops.get_cpu_khz = vmi_cpu_khz;
+               pv_time_ops.get_tsc_khz = vmi_tsc_khz;
 
                /* We have true wallclock functions; disable CMOS clock sync */
                no_sync_cmos_clock = 1;