summaryrefslogtreecommitdiffstats
path: root/sys/x86/x86/intr_machdep.c
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-07-12 13:40:57 -0300
committerRenato Botelho <renato@netgate.com>2017-07-12 13:40:57 -0300
commita9101a80183bbf3e77d7fed2b9767f7eae54f1e9 (patch)
tree5313afc4a2c47fb9fc6f73107669f760aad717b1 /sys/x86/x86/intr_machdep.c
parent4b68fbd1711d1d4d2c7e77e04ffc47257366ac90 (diff)
parentdc92a5e2298774036551d0b9cdfb9a8814a6414b (diff)
downloadFreeBSD-src-a9101a80183bbf3e77d7fed2b9767f7eae54f1e9.zip
FreeBSD-src-a9101a80183bbf3e77d7fed2b9767f7eae54f1e9.tar.gz
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'sys/x86/x86/intr_machdep.c')
-rw-r--r--sys/x86/x86/intr_machdep.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c
index cc50321..2d1c162 100644
--- a/sys/x86/x86/intr_machdep.c
+++ b/sys/x86/x86/intr_machdep.c
@@ -535,6 +535,9 @@ intr_shuffle_irqs(void *arg __unused)
if (mp_ncpus == 1)
return;
+ /* Does not work properly on Hyper-V. */
+ if (vm_guest == VM_GUEST_HV)
+ return;
/* Round-robin assign a CPU to each enabled source. */
mtx_lock(&intr_table_lock);
assign_cpu = 1;
OpenPOWER on IntegriCloud