diff options
author | sephe <sephe@FreeBSD.org> | 2016-04-15 02:20:18 +0000 |
---|---|---|
committer | sephe <sephe@FreeBSD.org> | 2016-04-15 02:20:18 +0000 |
commit | 3d593173121c94e1e0c292e67eba37c36230ecd4 (patch) | |
tree | 0c92dd0fe290f94fdfc98d288ce0b2575f3fb95a /sys/conf | |
parent | 634d36b00d7bc528be96c7d12da7faf778977561 (diff) | |
download | FreeBSD-src-3d593173121c94e1e0c292e67eba37c36230ecd4.zip FreeBSD-src-3d593173121c94e1e0c292e67eba37c36230ecd4.tar.gz |
hyperv: Deprecate HYPERV option by moving Hyper-V IDT vector into vmbus
Submitted by: Jun Su <junsu microsoft com>
Reviewed by: jhb, kib, sephe
Sponsored by: Microsoft OSTC
Differential Revision: https://reviews.freebsd.org/D5910
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/files.amd64 | 1 | ||||
-rw-r--r-- | sys/conf/files.i386 | 1 | ||||
-rw-r--r-- | sys/conf/options.amd64 | 2 | ||||
-rw-r--r-- | sys/conf/options.i386 | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 85366fa..ca31558 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -277,6 +277,7 @@ dev/hyperv/vmbus/hv_hv.c optional hyperv dev/hyperv/vmbus/hv_et.c optional hyperv dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv +dev/hyperv/vmbus/amd64/hv_vector.S optional hyperv dev/nfe/if_nfe.c optional nfe pci dev/ntb/if_ntb/if_ntb.c optional if_ntb dev/ntb/ntb_hw/ntb_hw.c optional if_ntb | ntb_hw diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 4b6f158..eb8585f 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -252,6 +252,7 @@ dev/hyperv/vmbus/hv_hv.c optional hyperv dev/hyperv/vmbus/hv_et.c optional hyperv dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c optional hyperv +dev/hyperv/vmbus/i386/hv_vector.S optional hyperv dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis dev/if_ndis/if_ndis_pccard.c optional ndis pccard diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 0e59187..f1d4b4a 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -63,7 +63,5 @@ BPF_JITTER opt_bpf.h XENHVM opt_global.h -HYPERV opt_global.h - # options for the Intel C600 SAS driver (isci) ISCI_LOGGING opt_isci.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 69eb7e3..e51f82c 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -123,7 +123,5 @@ BPF_JITTER opt_bpf.h XENHVM opt_global.h -HYPERV opt_global.h - # options for the Intel C600 SAS driver (isci) ISCI_LOGGING opt_isci.h |