From 5119948815bc5fe167d818216c33d0a4d9981895 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Mon, 27 Jun 2016 01:17:00 +0000 Subject: [PATCH] hyperv/vmbus: Fix mismerge of r301015 Submitted by: Oliver Pinter Sponsored by: Microsoft OSTC --- sys/dev/hyperv/vmbus/vmbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index 0430952d5159..4ad96d71a50d 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -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);