diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2013-09-08 02:53:41 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2013-09-08 02:53:41 +0000 |
| commit | 3c13b1cb496d3302788d8f8cddc47bc3b9cd9fcc (patch) | |
| tree | 7b81002027273510a8908abbd00c553644c38ed4 /sys/arch/amd64/conf | |
| parent | 9e91ce04e2b0d45a4eecca81923cc556977047c2 (diff) | |
Enable vmx(4) on i386 and amd64.
It will be enabled by default in the GENERIC and RAMDISK_CD kernels,
but you have to set vmxnet3 in the VMware configuration on the host;
see vmx(4).
ok deraadt@
Diffstat (limited to 'sys/arch/amd64/conf')
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 9c8868148c3..71489b98bb2 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.348 2013/09/05 19:42:06 sasano Exp $ +# $OpenBSD: GENERIC,v 1.349 2013/09/08 02:53:40 reyk Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -447,7 +447,7 @@ tht* at thtc? gem* at pci? # Sun 'gem' ethernet bce* at pci? # Broadcom BCM4401 vic* at pci? # VMware VMXnet virtual interface -#vmx* at pci? # VMware VMXNET3 virtual interface +vmx* at pci? # VMware VMXNET3 virtual interface et* at pci? # Agere/LSI ET1310 age* at pci? # Attansic L1 Ethernet alc* at pci? # Attansic L1C/L1D/L2C Ethernet diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index ac7235f99e9..b523610e7e6 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.127 2013/08/20 14:27:25 ajacoutot Exp $ +# $OpenBSD: RAMDISK_CD,v 1.128 2013/09/08 02:53:40 reyk Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -268,6 +268,7 @@ nfe* at pci? # NVIDIA nForce Ethernet xge* at pci? # Neterion Xframe-I/II 10Gb ethernet bce* at pci? # Broadcom BCM4401 vic* at pci? # VMware VMXnet virtual interface +vmx* at pci? # VMware VMXNET3 virtual interface et* at pci? # Agere/LSI ET1310 age* at pci? # Attansic L1 Ethernet alc* at pci? # Attansic L1C/L1D/L2C Ethernet |