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 5c7f7c035f4353a3fc1d70d0468b402d1dc6a3a0..ff36645f5df85b8ab58325045eb6e5690f840bb5 100644 (file)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -355,9 +355,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 3ddf41287a09c27033e9dd1f2f09a78fe55c2a0f..2fa020e97a01088bca58d7782c82200bc1d611c4 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 dc11f73c4302988074ecf0ebc2005c64fac62e55..a17e45df5f44fddf8e7e69605c941764be17b3d3 100644 (file)
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -373,9 +373,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