Author: sephe
Date: Mon Jun 27 01:17:00 2016
New Revision: 302220
URL: https://svnweb.freebsd.org/changeset/base/302220
Log:
hyperv/vmbus: Fix mismerge of r301015
Submitted by: Oliver Pinter <oliver.pinter hardenedbsd org>
Sponsored by: Microsoft OSTC
Modified:
stable/10/sys/dev/hyperv/vmbus/vmbus.c
Modified: stable/10/sys/dev/hyperv/vmbus/vmbus.c
==============================================================================
--- stable/10/sys/dev/hyperv/vmbus/vmbus.c Sun Jun 26 21:00:11 2016
(r302219)
+++ stable/10/sys/dev/hyperv/vmbus/vmbus.c Mon Jun 27 01:17:00 2016
(r302220)
@@ -404,7 +404,7 @@ vmbus_vector_alloc(void)
/*
* Search backwards form the highest IDT vector available for use
- * as vmbus channel callback vector. We install 'hv_vmbus_callback'
+ * as vmbus channel callback vector. We install 'vmbus_isr'
* handler at that vector and use it to interrupt vcpus.
*/
vector = APIC_SPURIOUS_INT;
@@ -443,7 +443,7 @@ vmbus_vector_free(int vector)
ip = &idt[vector];
func = ((long)ip->gd_hioffset << 16 | ip->gd_looffset);
- KASSERT(func == (uintptr_t)&IDTVEC(hv_vmbus_callback),
+ KASSERT(func == (uintptr_t)&IDTVEC(vmbus_isr),
("invalid vector %d", vector));
setidt(vector, IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
