diff options
Diffstat (limited to 'arch/i386/kernel/paravirt.c')
-rw-r--r-- | arch/i386/kernel/paravirt.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/i386/kernel/paravirt.c b/arch/i386/kernel/paravirt.c index c156ecfa3872..2ec331e03fa9 100644 --- a/arch/i386/kernel/paravirt.c +++ b/arch/i386/kernel/paravirt.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <asm/fixmap.h> | 32 | #include <asm/fixmap.h> |
33 | #include <asm/apic.h> | 33 | #include <asm/apic.h> |
34 | #include <asm/tlbflush.h> | 34 | #include <asm/tlbflush.h> |
35 | #include <asm/timer.h> | ||
35 | 36 | ||
36 | /* nop stub */ | 37 | /* nop stub */ |
37 | static void native_nop(void) | 38 | static void native_nop(void) |
@@ -493,7 +494,7 @@ struct paravirt_ops paravirt_ops = { | |||
493 | .memory_setup = machine_specific_memory_setup, | 494 | .memory_setup = machine_specific_memory_setup, |
494 | .get_wallclock = native_get_wallclock, | 495 | .get_wallclock = native_get_wallclock, |
495 | .set_wallclock = native_set_wallclock, | 496 | .set_wallclock = native_set_wallclock, |
496 | .time_init = time_init_hook, | 497 | .time_init = hpet_time_init, |
497 | .init_IRQ = native_init_IRQ, | 498 | .init_IRQ = native_init_IRQ, |
498 | 499 | ||
499 | .cpuid = native_cpuid, | 500 | .cpuid = native_cpuid, |
@@ -520,6 +521,8 @@ struct paravirt_ops paravirt_ops = { | |||
520 | .write_msr = native_write_msr, | 521 | .write_msr = native_write_msr, |
521 | .read_tsc = native_read_tsc, | 522 | .read_tsc = native_read_tsc, |
522 | .read_pmc = native_read_pmc, | 523 | .read_pmc = native_read_pmc, |
524 | .get_scheduled_cycles = native_read_tsc, | ||
525 | .get_cpu_khz = native_calculate_cpu_khz, | ||
523 | .load_tr_desc = native_load_tr_desc, | 526 | .load_tr_desc = native_load_tr_desc, |
524 | .set_ldt = native_set_ldt, | 527 | .set_ldt = native_set_ldt, |
525 | .load_gdt = native_load_gdt, | 528 | .load_gdt = native_load_gdt, |
@@ -535,7 +538,6 @@ struct paravirt_ops paravirt_ops = { | |||
535 | 538 | ||
536 | .set_iopl_mask = native_set_iopl_mask, | 539 | .set_iopl_mask = native_set_iopl_mask, |
537 | .io_delay = native_io_delay, | 540 | .io_delay = native_io_delay, |
538 | .const_udelay = __const_udelay, | ||
539 | 541 | ||
540 | #ifdef CONFIG_X86_LOCAL_APIC | 542 | #ifdef CONFIG_X86_LOCAL_APIC |
541 | .apic_write = native_apic_write, | 543 | .apic_write = native_apic_write, |
@@ -550,6 +552,8 @@ struct paravirt_ops paravirt_ops = { | |||
550 | .flush_tlb_kernel = native_flush_tlb_global, | 552 | .flush_tlb_kernel = native_flush_tlb_global, |
551 | .flush_tlb_single = native_flush_tlb_single, | 553 | .flush_tlb_single = native_flush_tlb_single, |
552 | 554 | ||
555 | .map_pt_hook = (void *)native_nop, | ||
556 | |||
553 | .alloc_pt = (void *)native_nop, | 557 | .alloc_pt = (void *)native_nop, |
554 | .alloc_pd = (void *)native_nop, | 558 | .alloc_pd = (void *)native_nop, |
555 | .alloc_pd_clone = (void *)native_nop, | 559 | .alloc_pd_clone = (void *)native_nop, |