svn commit: r303422 - in head/sys/dev/hyperv: include netvsc storvsc utilities vmbus
Sepherosa Ziehau
sephe at FreeBSD.org
Thu Jul 28 06:46:13 UTC 2016
Author: sephe
Date: Thu Jul 28 06:46:10 2016
New Revision: 303422
URL: https://svnweb.freebsd.org/changeset/base/303422
Log:
hyperv/vmbus: Inclusion cleanup
MFC after: 1 week
Sponsored by: Microsoft
Differential Revision: https://reviews.freebsd.org/D7334
Modified:
head/sys/dev/hyperv/include/hyperv.h
head/sys/dev/hyperv/include/vmbus.h
head/sys/dev/hyperv/netvsc/hv_net_vsc.h
head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
head/sys/dev/hyperv/utilities/hv_heartbeat.c
head/sys/dev/hyperv/utilities/hv_shutdown.c
head/sys/dev/hyperv/utilities/hv_timesync.c
head/sys/dev/hyperv/vmbus/hyperv.c
head/sys/dev/hyperv/vmbus/vmbus.c
head/sys/dev/hyperv/vmbus/vmbus_chan.c
head/sys/dev/hyperv/vmbus/vmbus_et.c
head/sys/dev/hyperv/vmbus/vmbus_var.h
Modified: head/sys/dev/hyperv/include/hyperv.h
==============================================================================
--- head/sys/dev/hyperv/include/hyperv.h Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/include/hyperv.h Thu Jul 28 06:46:10 2016 (r303422)
@@ -28,36 +28,14 @@
* $FreeBSD$
*/
-/**
- * HyperV definitions for messages that are sent between instances of the
- * Channel Management Library in separate partitions, or in some cases,
- * back to itself.
- */
-
-#ifndef __HYPERV_H__
-#define __HYPERV_H__
+#ifndef _HYPERV_H_
+#define _HYPERV_H_
#include <sys/param.h>
-#include <sys/mbuf.h>
-#include <sys/queue.h>
-#include <sys/malloc.h>
-#include <sys/kthread.h>
-#include <sys/taskqueue.h>
-#include <sys/systm.h>
-#include <sys/lock.h>
-#include <sys/sema.h>
-#include <sys/smp.h>
-#include <sys/mutex.h>
-#include <sys/bus.h>
-#include <sys/sysctl.h>
+
#include <vm/vm.h>
-#include <vm/vm_param.h>
#include <vm/pmap.h>
-#include <amd64/include/xen/synch_bitops.h>
-#include <amd64/include/atomic.h>
-#include <dev/hyperv/include/hyperv_busdma.h>
-
struct hyperv_guid {
uint8_t hv_guid[16];
} __packed;
@@ -77,4 +55,4 @@ hv_get_phys_addr(void *virt)
return (ret);
}
-#endif /* __HYPERV_H__ */
+#endif /* _HYPERV_H_ */
Modified: head/sys/dev/hyperv/include/vmbus.h
==============================================================================
--- head/sys/dev/hyperv/include/vmbus.h Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/include/vmbus.h Thu Jul 28 06:46:10 2016 (r303422)
@@ -30,6 +30,7 @@
#define _VMBUS_H_
#include <sys/param.h>
+#include <sys/bus.h>
/*
* VMBUS version is 32 bit, upper 16 bit for major_number and lower
Modified: head/sys/dev/hyperv/netvsc/hv_net_vsc.h
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_net_vsc.h Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/netvsc/hv_net_vsc.h Thu Jul 28 06:46:10 2016 (r303422)
@@ -44,6 +44,7 @@
#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/taskqueue.h>
+#include <sys/sema.h>
#include <sys/sx.h>
#include <machine/bus.h>
Modified: head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
#include <sys/queue.h>
#include <sys/lock.h>
#include <sys/sx.h>
+#include <sys/smp.h>
#include <sys/sysctl.h>
#include <sys/buf_ring.h>
Modified: head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
==============================================================================
--- head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
#include <sys/bus.h>
#include <sys/mutex.h>
#include <sys/callout.h>
+#include <sys/smp.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/uma.h>
Modified: head/sys/dev/hyperv/utilities/hv_heartbeat.c
==============================================================================
--- head/sys/dev/hyperv/utilities/hv_heartbeat.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/utilities/hv_heartbeat.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -33,6 +33,7 @@
#include <sys/module.h>
#include <sys/timetc.h>
#include <sys/syscallsubr.h>
+#include <sys/systm.h>
#include <dev/hyperv/include/hyperv.h>
#include <dev/hyperv/include/vmbus.h>
Modified: head/sys/dev/hyperv/utilities/hv_shutdown.c
==============================================================================
--- head/sys/dev/hyperv/utilities/hv_shutdown.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/utilities/hv_shutdown.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -38,6 +38,7 @@
#include <sys/reboot.h>
#include <sys/timetc.h>
#include <sys/syscallsubr.h>
+#include <sys/systm.h>
#include <dev/hyperv/include/hyperv.h>
#include <dev/hyperv/include/vmbus.h>
Modified: head/sys/dev/hyperv/utilities/hv_timesync.c
==============================================================================
--- head/sys/dev/hyperv/utilities/hv_timesync.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/utilities/hv_timesync.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -38,6 +38,8 @@
#include <sys/reboot.h>
#include <sys/timetc.h>
#include <sys/syscallsubr.h>
+#include <sys/systm.h>
+#include <sys/taskqueue.h>
#include <dev/hyperv/include/hyperv.h>
#include <dev/hyperv/include/vmbus.h>
Modified: head/sys/dev/hyperv/vmbus/hyperv.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/hyperv.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/vmbus/hyperv.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -34,23 +34,14 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/pcpu.h>
+#include <sys/systm.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
-#include <machine/md_var.h>
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <dev/hyperv/include/hyperv.h>
#include <dev/hyperv/include/hyperv_busdma.h>
#include <dev/hyperv/vmbus/hyperv_machdep.h>
#include <dev/hyperv/vmbus/hyperv_reg.h>
#include <dev/hyperv/vmbus/hyperv_var.h>
-#if 0
-#include <dev/hyperv/vmbus/vmbus_var.h>
-#endif
#define HYPERV_FREEBSD_BUILD 0ULL
#define HYPERV_FREEBSD_VERSION ((uint64_t)__FreeBSD_version)
Modified: head/sys/dev/hyperv/vmbus/vmbus.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/vmbus/vmbus.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -38,26 +38,16 @@ __FBSDID("$FreeBSD$");
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/module.h>
-#include <sys/proc.h>
+#include <sys/mutex.h>
+#include <sys/smp.h>
#include <sys/sysctl.h>
-#include <sys/syslog.h>
#include <sys/systm.h>
-#include <sys/rtprio.h>
-#include <sys/interrupt.h>
-#include <sys/sx.h>
#include <sys/taskqueue.h>
-#include <sys/mutex.h>
-#include <sys/smp.h>
-#include <machine/resource.h>
-#include <sys/rman.h>
-
-#include <machine/stdarg.h>
#include <machine/intr_machdep.h>
-#include <machine/md_var.h>
-#include <machine/segments.h>
-#include <sys/pcpu.h>
-#include <x86/apicvar.h>
+#include <x86/include/apicvar.h>
+
+#include <contrib/dev/acpica/include/acpi.h>
#include <dev/hyperv/include/hyperv.h>
#include <dev/hyperv/vmbus/hyperv_reg.h>
@@ -66,7 +56,6 @@ __FBSDID("$FreeBSD$");
#include <dev/hyperv/vmbus/vmbus_var.h>
#include <dev/hyperv/vmbus/vmbus_chanvar.h>
-#include <contrib/dev/acpica/include/acpi.h>
#include "acpi_if.h"
#include "vmbus_if.h"
Modified: head/sys/dev/hyperv/vmbus/vmbus_chan.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_chan.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/vmbus/vmbus_chan.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -31,19 +31,14 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/systm.h>
-#include <sys/mbuf.h>
#include <sys/lock.h>
+#include <sys/malloc.h>
#include <sys/mutex.h>
+#include <sys/smp.h>
#include <sys/sysctl.h>
+#include <sys/systm.h>
#include <machine/atomic.h>
-#include <machine/bus.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
#include <dev/hyperv/include/hyperv_busdma.h>
#include <dev/hyperv/vmbus/hyperv_var.h>
Modified: head/sys/dev/hyperv/vmbus/vmbus_et.c
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_et.c Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/vmbus/vmbus_et.c Thu Jul 28 06:46:10 2016 (r303422)
@@ -32,9 +32,8 @@ __FBSDID("$FreeBSD$");
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/proc.h>
-#include <sys/systm.h>
#include <sys/smp.h>
-#include <sys/time.h>
+#include <sys/systm.h>
#include <sys/timeet.h>
#include <dev/hyperv/vmbus/hyperv_reg.h>
Modified: head/sys/dev/hyperv/vmbus/vmbus_var.h
==============================================================================
--- head/sys/dev/hyperv/vmbus/vmbus_var.h Thu Jul 28 06:30:29 2016 (r303421)
+++ head/sys/dev/hyperv/vmbus/vmbus_var.h Thu Jul 28 06:46:10 2016 (r303422)
@@ -30,7 +30,6 @@
#define _VMBUS_VAR_H_
#include <sys/param.h>
-#include <sys/bus_dma.h>
#include <sys/taskqueue.h>
#include <dev/hyperv/include/hyperv_busdma.h>
More information about the svn-src-all
mailing list