From owner-svn-src-stable-10@freebsd.org  Mon Jun 27 01:17:01 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47381A79797;
 Mon, 27 Jun 2016 01:17:01 +0000 (UTC)
 (envelope-from sephe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 169262B60;
 Mon, 27 Jun 2016 01:17:01 +0000 (UTC)
 (envelope-from sephe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5R1H0pu058040;
 Mon, 27 Jun 2016 01:17:00 GMT (envelope-from sephe@FreeBSD.org)
Received: (from sephe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5R1H0JP058038;
 Mon, 27 Jun 2016 01:17:00 GMT (envelope-from sephe@FreeBSD.org)
Message-Id: <201606270117.u5R1H0JP058038@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sephe set sender to
 sephe@FreeBSD.org using -f
From: Sepherosa Ziehau <sephe@FreeBSD.org>
Date: Mon, 27 Jun 2016 01:17:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r302220 - stable/10/sys/dev/hyperv/vmbus
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Jun 2016 01:17:01 -0000

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);