Page MenuHomeFreeBSD
Files F107682987

D40419.diff
No OneTemporary
Actions

D40419.diff
View Options

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -891,15 +891,12 @@
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \
${MACHINE_CPUARCH} == "aarch64"
+_gve.4= gve.4
_ipmi.4= ipmi.4
_linux.4= linux.4
_ossl.4= ossl.4
.endif
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64"
-_gve.4= gve.4
-.endif
-
.if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \
${MACHINE_CPUARCH} == "riscv"
_cgem.4= cgem.4
diff --git a/sys/amd64/conf/LINT-NOIP b/sys/amd64/conf/LINT-NOIP
--- a/sys/amd64/conf/LINT-NOIP
+++ b/sys/amd64/conf/LINT-NOIP
@@ -13,6 +13,7 @@
nodevice bxe
nodevice em
nodevice fxp
+nodevice gve
nodevice jme
nodevice lio
nodevice msk
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -499,6 +499,9 @@
# Linux KVM paravirtualization support
device kvm_clock # KVM paravirtual clock driver
+# Google Virtual NIC
+device gve # Google Virtual NIC (gVNIC) driver
+
# Microsoft Hyper-V enhancement support
device hyperv # HyperV drivers
device hvhid # HyperV HID device
diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -68,6 +68,9 @@
device virtio_blk
device vtnet
+# Google Virtual NIC
+device gve # Google Virtual NIC (gVNIC) driver
+
# Microsoft Hyper-V
device hyperv
diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c
--- a/sys/dev/gve/gve_qpl.c
+++ b/sys/dev/gve/gve_qpl.c
@@ -101,9 +101,9 @@
int i;
if (npages + priv->num_registered_pages > priv->max_registered_pages) {
- device_printf(priv->dev, "Reached max number of registered pages %lu > %lu\n",
- npages + priv->num_registered_pages,
- priv->max_registered_pages);
+ device_printf(priv->dev, "Reached max number of registered pages %ju > %ju\n",
+ (uintmax_t)npages + priv->num_registered_pages,
+ (uintmax_t)priv->max_registered_pages);
return (EINVAL);
}
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -701,6 +701,9 @@
# Linux KVM paravirtualization support
device kvm_clock # KVM paravirtual clock driver
+# Google Virtual NIC
+device gve # Google Virtual NIC (gVNIC) driver
+
options HYPERV
device hyperv # HyperV drivers
device hvhid # HyperV HID device
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -555,13 +555,10 @@
.endif
.endif
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"
-_gve= gve
-.endif
-
.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \
${MACHINE_CPUARCH} == "i386"
_ena= ena
+_gve= gve
_iwlwifi= iwlwifi
.if ${MK_SOURCELESS_UCODE} != "no"
_iwlwififw= iwlwififw

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 18, 1:34 PM (18 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15862026
Default Alt Text
D40419.diff (2 KB)

Event Timeline