svn commit: r307114 - in stable/10/sys: conf dev/hyperv/vmbus modules/hyperv/vmbus

[Sepherosa Ziehau]

Author: sephe
Date: Wed Oct 12 05:28:24 2016
New Revision: 307114
URL: https://svnweb.freebsd.org/changeset/base/307114

Log:
  MFC 303379
  
      hyperv/vmbus: Rename cleaned up bufring code
  
      Sponsored by:   Microsoft
      Differential Revision:  https://reviews.freebsd.org/D7318

Added:
  stable/10/sys/dev/hyperv/vmbus/vmbus_br.c
     - copied, changed from r303379, head/sys/dev/hyperv/vmbus/vmbus_br.c
Deleted:
  stable/10/sys/dev/hyperv/vmbus/hv_ring_buffer.c
Modified:
  stable/10/sys/conf/files.amd64
  stable/10/sys/conf/files.i386
  stable/10/sys/modules/hyperv/vmbus/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/conf/files.amd64
==============================================================================
--- stable/10/sys/conf/files.amd64	Wed Oct 12 05:20:06 2016	(r307113)
+++ stable/10/sys/conf/files.amd64	Wed Oct 12 05:28:24 2016	(r307114)
@@ -271,10 +271,10 @@ dev/hyperv/utilities/hv_kvp.c				optiona
 dev/hyperv/utilities/hv_shutdown.c			optional	hyperv
 dev/hyperv/utilities/hv_timesync.c			optional	hyperv
 dev/hyperv/utilities/hv_util.c				optional	hyperv
-dev/hyperv/vmbus/hv_ring_buffer.c			optional	hyperv
 dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
 dev/hyperv/vmbus/vmbus.c				optional	hyperv
+dev/hyperv/vmbus/vmbus_br.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_chan.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_et.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_if.m				optional	hyperv

Modified: stable/10/sys/conf/files.i386
==============================================================================
--- stable/10/sys/conf/files.i386	Wed Oct 12 05:20:06 2016	(r307113)
+++ stable/10/sys/conf/files.i386	Wed Oct 12 05:28:24 2016	(r307114)
@@ -248,10 +248,10 @@ dev/hyperv/utilities/hv_kvp.c				optiona
 dev/hyperv/utilities/hv_shutdown.c			optional	hyperv
 dev/hyperv/utilities/hv_timesync.c			optional	hyperv
 dev/hyperv/utilities/hv_util.c				optional	hyperv
-dev/hyperv/vmbus/hv_ring_buffer.c			optional	hyperv
 dev/hyperv/vmbus/hyperv.c				optional	hyperv
 dev/hyperv/vmbus/hyperv_busdma.c			optional	hyperv
 dev/hyperv/vmbus/vmbus.c				optional	hyperv
+dev/hyperv/vmbus/vmbus_br.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_chan.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_et.c				optional	hyperv
 dev/hyperv/vmbus/vmbus_if.m				optional	hyperv

Copied and modified: stable/10/sys/dev/hyperv/vmbus/vmbus_br.c (from r303379, head/sys/dev/hyperv/vmbus/vmbus_br.c)
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_br.c	Wed Jul 27 09:27:08 2016	(r303379, copy source)
+++ stable/10/sys/dev/hyperv/vmbus/vmbus_br.c	Wed Oct 12 05:28:24 2016	(r307114)
@@ -26,6 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>

Modified: stable/10/sys/modules/hyperv/vmbus/Makefile
==============================================================================
--- stable/10/sys/modules/hyperv/vmbus/Makefile	Wed Oct 12 05:20:06 2016	(r307113)
+++ stable/10/sys/modules/hyperv/vmbus/Makefile	Wed Oct 12 05:28:24 2016	(r307114)
@@ -4,11 +4,11 @@
 	${.CURDIR}/../../../dev/hyperv/vmbus/${MACHINE_CPUARCH}
 
 KMOD=	hv_vmbus
-SRCS=	hv_ring_buffer.c \
-	hyperv.c \
+SRCS=	hyperv.c \
 	hyperv_busdma.c \
 	hyperv_machdep.c \
 	vmbus.c \
+	vmbus_br.c \
 	vmbus_chan.c \
 	vmbus_et.c
 SRCS+=	acpi_if.h bus_if.h device_if.h opt_acpi.h vmbus_if.h