jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

hyperv/vmbus: Fix mismerge of r301015

Browse Source 
Submitted by:	Oliver Pinter <oliver.pinter hardenedbsd org>
Sponsored by:	Microsoft OSTC
This commit is contained in:
Sepherosa Ziehau 2016-06-27 01:17:00 +00:00
parent 8e8d4c7040
commit 5119948815
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/10/; revision=302220
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/hyperv/vmbus/vmbus.c
View File

@ -404,7 +404,7 @@ vmbus_vector_alloc(void)
/* /*
* Search backwards form the highest IDT vector available for use * 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. * handler at that vector and use it to interrupt vcpus.
*/ */
vector = APIC_SPURIOUS_INT; vector = APIC_SPURIOUS_INT;
@ -443,7 +443,7 @@ vmbus_vector_free(int vector)
ip = &idt[vector]; ip = &idt[vector];
func = ((long)ip->gd_hioffset << 16 | ip->gd_looffset); 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)); ("invalid vector %d", vector));
setidt(vector, IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); setidt(vector, IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0);