diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:28:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-31 12:28:38 -0700 |
| commit | c0fc3cbac0a6fe40f98c5e5ed5f2df5e291bc94d (patch) | |
| tree | efd9692d0d83bfae81dd09059b8473fded1964b6 /arch/x86 | |
| parent | d9fcca40eba3266c1c8b6d9d7ab163861ad23b66 (diff) | |
| parent | ca3ba2a2f4a49a308e7d78c784d51b2332064f15 (diff) | |
| download | op-kernel-dev-c0fc3cbac0a6fe40f98c5e5ed5f2df5e291bc94d.zip op-kernel-dev-c0fc3cbac0a6fe40f98c5e5ed5f2df5e291bc94d.tar.gz | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/mshyperv.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index 9f7ca26..832d05a 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -26,6 +26,7 @@ #include <asm/irq_regs.h> #include <asm/i8259.h> #include <asm/apic.h> +#include <asm/timer.h> struct ms_hyperv_info 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) 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 = { |
