Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0fc3cba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 hyperv change from Ingo Molnar:
 "Skip the timer_irq_works() check on hyperv systems"

* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, hyperv: Bypass the timer_irq_works() check
parents d9fcca40 ca3ba2a2

arch/x86/kernel/cpu/mshyperv.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/irq_regs.h>

#include <asm/irq_regs.h>

#include <asm/i8259.h>

#include <asm/i8259.h>

#include <asm/apic.h>

#include <asm/apic.h>

#include <asm/timer.h>





struct ms_hyperv_info ms_hyperv;

struct ms_hyperv_info ms_hyperv;

EXPORT_SYMBOL_GPL(ms_hyperv);

EXPORT_SYMBOL_GPL(ms_hyperv);
@@ -105,6 +106,11 @@ static void __init ms_hyperv_init_platform(void) 




	if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)

	if (ms_hyperv.features & HV_X64_MSR_TIME_REF_COUNT_AVAILABLE)

		clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);

		clocksource_register_hz(&hyperv_cs, NSEC_PER_SEC/100);



#ifdef CONFIG_X86_IO_APIC

	no_timer_check = 1;

#endif



}

}





const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {

const __refconst struct hypervisor_x86 x86_hyper_ms_hyperv = {