The branch main has been updated by royger:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ae5981274815804e31f891f908627aa21696820e
commit ae5981274815804e31f891f908627aa21696820e
Author: Julien Grall <jul...@xen.org>
AuthorDate: 2014-01-14 01:41:14 +0000
Commit: Roger Pau Monné <roy...@freebsd.org>
CommitDate: 2021-07-28 15:27:03 +0000
xen/timer: make xen timer optional
The timer is not used on ARM.
Submitted by: Elliott Mitchell <ehem+free...@m5p.com>
Reviewed by: royger
Differential Revision: https://reviews.freebsd.org/D29041
---
sys/amd64/conf/GENERIC | 4 +++-
sys/conf/files | 2 +-
sys/i386/conf/GENERIC | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index a28dc238af8d..fa531e13a3b9 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -380,9 +380,11 @@ device virtio_balloon # VirtIO Memory
Balloon device
device hyperv # HyperV drivers
# Xen HVM Guest Optimizations
-# NOTE: XENHVM depends on xenpci. They must be added or removed together.
+# NOTE: XENHVM and xenpci interdepend. They must be added or removed
+# together. xentimer depends on XENHVM and isn't required.
options XENHVM # Xen HVM kernel infrastructure
device xenpci # Xen HVM Hypervisor services driver
+device xentimer # Xen x86 PV timer device
# Netmap provides direct access to TX/RX rings on supported NICs
device netmap # netmap(4) support
diff --git a/sys/conf/files b/sys/conf/files
index efb0d4acac4a..ae3fd61ed7a1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3548,8 +3548,8 @@ dev/xen/efi/pvefi.c optional xenhvm efirt
dev/xen/grant_table/grant_table.c optional xenhvm
dev/xen/netback/netback.c optional xenhvm
dev/xen/netfront/netfront.c optional xenhvm
+dev/xen/timer/timer.c optional xenhvm xentimer
dev/xen/xenpci/xenpci.c optional xenpci
-dev/xen/timer/timer.c optional xenhvm
dev/xen/xenstore/xenstore.c optional xenhvm
dev/xen/xenstore/xenstore_dev.c optional xenhvm
dev/xen/xenstore/xenstored_dev.c optional xenhvm
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 96d0803e1f2e..86c062effd81 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -343,9 +343,11 @@ options HYPERV # Kernel support for
HyperV drivers
device hyperv # HyperV drivers
# Xen HVM Guest Optimizations
-# NOTE: XENHVM depends on xenpci. They must be added or removed together.
+# NOTE: XENHVM and xenpci interdepend. They must be added or removed
+# together. xentimer depends on XENHVM and isn't required.
options XENHVM # Xen HVM kernel infrastructure
device xenpci # Xen HVM Hypervisor services driver
+device xentimer # Xen x86 PV timer device
# evdev interface
options EVDEV_SUPPORT # evdev support in legacy drivers
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
