xen/timer: make xen timer optional

The timer is not used on ARM.

Submitted by: Elliott Mitchell <ehem+freebsd@m5p.com>
Reviewed by: royger
Differential Revision: https://reviews.freebsd.org/D29041
This commit is contained in:
Julien Grall
2014-01-13 17:41:14 -08:00
committed by Roger Pau Monné
parent 5ca00e0c98
commit ae59812748
3 changed files with 7 additions and 3 deletions
+3 -1
View File
@@ -380,9 +380,11 @@ device virtio_balloon # VirtIO Memory Balloon device
device hyperv # HyperV drivers device hyperv # HyperV drivers
# Xen HVM Guest Optimizations # 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 options XENHVM # Xen HVM kernel infrastructure
device xenpci # Xen HVM Hypervisor services driver 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 # Netmap provides direct access to TX/RX rings on supported NICs
device netmap # netmap(4) support device netmap # netmap(4) support
+1 -1
View File
@@ -3548,8 +3548,8 @@ dev/xen/efi/pvefi.c optional xenhvm efirt
dev/xen/grant_table/grant_table.c optional xenhvm dev/xen/grant_table/grant_table.c optional xenhvm
dev/xen/netback/netback.c optional xenhvm dev/xen/netback/netback.c optional xenhvm
dev/xen/netfront/netfront.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/xenpci/xenpci.c optional xenpci
dev/xen/timer/timer.c optional xenhvm
dev/xen/xenstore/xenstore.c optional xenhvm dev/xen/xenstore/xenstore.c optional xenhvm
dev/xen/xenstore/xenstore_dev.c optional xenhvm dev/xen/xenstore/xenstore_dev.c optional xenhvm
dev/xen/xenstore/xenstored_dev.c optional xenhvm dev/xen/xenstore/xenstored_dev.c optional xenhvm
+3 -1
View File
@@ -343,9 +343,11 @@ options HYPERV # Kernel support for HyperV drivers
device hyperv # HyperV drivers device hyperv # HyperV drivers
# Xen HVM Guest Optimizations # 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 options XENHVM # Xen HVM kernel infrastructure
device xenpci # Xen HVM Hypervisor services driver device xenpci # Xen HVM Hypervisor services driver
device xentimer # Xen x86 PV timer device
# evdev interface # evdev interface
options EVDEV_SUPPORT # evdev support in legacy drivers options EVDEV_SUPPORT # evdev support in legacy drivers