xen/timer: Make xen timer optional

The timer is not used on ARM.

diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index ec943f94f17a95c48abc6471e8ef7681ab849ed8..9e87050a621debdbff24cf897941db8af0b2b148 100644 (file)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -354,9 +354,11 @@ options    HYPERV                  # Hyper-V kernel infrastructure
 device         hyperv                  # HyperV drivers 
 
 # Xen HVM Guest Optimizations
-# NOTE: XENHVM depends on xenpci.  They must be added or removed together.
+# NOTE: XENHVM depends on xenpci and xentimer.
+# They must be added or removed together.
 options        XENHVM                  # Xen HVM kernel infrastructure
 device         xenpci                  # Xen HVM Hypervisor services driver
+device         xentimer
 
 # VMware support
 device         vmx                     # VMware VMXNET3 Ethernet

diff --git a/sys/conf/files b/sys/conf/files
index c07cf408a6d5cc94538d56e5e04679761fd4cd5f..717bdf23cdbc193a4eff2d0aaae111fc6c49ee81 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2859,7 +2859,7 @@ 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/xenpci/xenpci.c                optional xenpci
-dev/xen/timer/timer.c          optional xenhvm
+dev/xen/timer/timer.c          optional xentimer
 dev/xen/pvcpu/pvcpu.c          optional xenhvm
 dev/xen/xenstore/xenstore.c    optional xenhvm
 dev/xen/xenstore/xenstore_dev.c        optional xenhvm

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index ca57521241e2cd5bfa465c5846a6fd941e396dbf..8ee4e531e766d0b6a2a1d1adbae2307601d7e4f5 100644 (file)
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -372,9 +372,11 @@ options    HYPERV                  # Hyper-V kernel infrastructure
 device         hyperv                  # HyperV drivers 
 
 # Xen HVM Guest Optimizations
-# NOTE: XENHVM depends on xenpci.  They must be added or removed together.
+# NOTE: XENHVM depends on xenpci and xentimer.
+# They must be added or removed together.
 options        XENHVM                  # Xen HVM kernel infrastructure
 device         xenpci                  # Xen HVM Hypervisor services driver
+device         xentimer
 
 # VMware support
 device         vmx                     # VMware VMXNET3 Ethernet