diff options
| author | Sepherosa Ziehau <sephe@FreeBSD.org> | 2016-07-25 03:12:40 +0000 |
|---|---|---|
| committer | Sepherosa Ziehau <sephe@FreeBSD.org> | 2016-07-25 03:12:40 +0000 |
| commit | 7dd8881ca62b3558233a60e77ae6999b212afb06 (patch) | |
| tree | 1c4af8173d4ac51652b82494038db1be46f41103 /sys/dev/hyperv | |
| parent | 8485a1f6773faf294c8cf4bdb2e72fb0fcd03205 (diff) | |
| download | src-7dd8881ca62b3558233a60e77ae6999b212afb06.tar.gz src-7dd8881ca62b3558233a60e77ae6999b212afb06.zip | |
Notes
Diffstat (limited to 'sys/dev/hyperv')
| -rw-r--r-- | sys/dev/hyperv/netvsc/hv_rndis_filter.c | 1 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/hv_ring_buffer.c | 2 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/hyperv.c | 4 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/hyperv_reg.h | 1 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/vmbus.c | 2 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/vmbus_brvar.h (renamed from sys/dev/hyperv/vmbus/hv_vmbus_priv.h) | 0 | ||||
| -rw-r--r-- | sys/dev/hyperv/vmbus/vmbus_chan.c | 3 |
7 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/hyperv/netvsc/hv_rndis_filter.c b/sys/dev/hyperv/netvsc/hv_rndis_filter.c index 7426b8926cdb..ec7b42097302 100644 --- a/sys/dev/hyperv/netvsc/hv_rndis_filter.c +++ b/sys/dev/hyperv/netvsc/hv_rndis_filter.c @@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <dev/hyperv/include/hyperv.h> -#include <dev/hyperv/vmbus/hv_vmbus_priv.h> #include "hv_net_vsc.h" #include "hv_rndis.h" #include "hv_rndis_filter.h" diff --git a/sys/dev/hyperv/vmbus/hv_ring_buffer.c b/sys/dev/hyperv/vmbus/hv_ring_buffer.c index e8dd836e9e3f..ff320986f6f4 100644 --- a/sys/dev/hyperv/vmbus/hv_ring_buffer.c +++ b/sys/dev/hyperv/vmbus/hv_ring_buffer.c @@ -31,8 +31,8 @@ #include <sys/mutex.h> #include <sys/sysctl.h> -#include "hv_vmbus_priv.h" #include <dev/hyperv/vmbus/vmbus_reg.h> +#include <dev/hyperv/vmbus/vmbus_brvar.h> /* Amount of space to write to */ #define HV_BYTES_AVAIL_TO_WRITE(r, w, z) \ diff --git a/sys/dev/hyperv/vmbus/hyperv.c b/sys/dev/hyperv/vmbus/hyperv.c index 3040e533b23a..02cde9d768b9 100644 --- a/sys/dev/hyperv/vmbus/hyperv.c +++ b/sys/dev/hyperv/vmbus/hyperv.c @@ -43,12 +43,14 @@ __FBSDID("$FreeBSD$"); #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/hv_vmbus_priv.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) diff --git a/sys/dev/hyperv/vmbus/hyperv_reg.h b/sys/dev/hyperv/vmbus/hyperv_reg.h index 060137491c60..97969585e6aa 100644 --- a/sys/dev/hyperv/vmbus/hyperv_reg.h +++ b/sys/dev/hyperv/vmbus/hyperv_reg.h @@ -30,6 +30,7 @@ #define _HYPERV_REG_H_ #include <sys/param.h> +#include <sys/systm.h> /* * Hyper-V Synthetic MSRs diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index 2d7f3a0da535..57f4b1f5d3eb 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -60,11 +60,11 @@ __FBSDID("$FreeBSD$"); #include <x86/apicvar.h> #include <dev/hyperv/include/hyperv.h> -#include <dev/hyperv/vmbus/hv_vmbus_priv.h> #include <dev/hyperv/vmbus/hyperv_reg.h> #include <dev/hyperv/vmbus/hyperv_var.h> #include <dev/hyperv/vmbus/vmbus_reg.h> #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" diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_priv.h b/sys/dev/hyperv/vmbus/vmbus_brvar.h index b57a96378dc7..b57a96378dc7 100644 --- a/sys/dev/hyperv/vmbus/hv_vmbus_priv.h +++ b/sys/dev/hyperv/vmbus/vmbus_brvar.h diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c index b7a4b2ccd71f..44f57cda2b9a 100644 --- a/sys/dev/hyperv/vmbus/vmbus_chan.c +++ b/sys/dev/hyperv/vmbus/vmbus_chan.c @@ -46,10 +46,11 @@ __FBSDID("$FreeBSD$"); #include <vm/pmap.h> #include <dev/hyperv/include/hyperv_busdma.h> -#include <dev/hyperv/vmbus/hv_vmbus_priv.h> #include <dev/hyperv/vmbus/hyperv_var.h> #include <dev/hyperv/vmbus/vmbus_reg.h> #include <dev/hyperv/vmbus/vmbus_var.h> +#include <dev/hyperv/vmbus/vmbus_brvar.h> +#include <dev/hyperv/vmbus/vmbus_chanvar.h> static void vmbus_chan_update_evtflagcnt(struct vmbus_softc *, const struct vmbus_channel *); |