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 bdaca33960f3906c2ccd191df93c18ee3a8780e0..ecfdf436d12dbdb39d7d27728cdf30369f6fb809 100644 (file)
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -344,9 +344,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 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 165e0ca74417e4a9034c1243ca2e4bcb007e1157..0e8b2e9631d225b31f17c632402e507489c57bf5 100644 (file)
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2699,7 +2699,7 @@ dev/xen/grant_table/grant_table.c optional xen | xenhvm
 dev/xen/netback/netback.c      optional xen | xenhvm
 dev/xen/netfront/netfront.c    optional xen | xenhvm
 dev/xen/xenpci/xenpci.c                optional xenpci
-dev/xen/timer/timer.c          optional xen | xenhvm
+dev/xen/timer/timer.c          optional xentimer
 dev/xen/pvcpu/pvcpu.c          optional xen | xenhvm
 dev/xen/xenstore/xenstore.c    optional xen | xenhvm
 dev/xen/xenstore/xenstore_dev.c        optional xen | xenhvm

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 086844a87ea1803efceb7c1348d2b18fc7141b55..2eccc08ce857580317500d614ce475a6b17b0dbd 100644 (file)
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -362,9 +362,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 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/i386/conf/XEN b/sys/i386/conf/XEN
index dd83670e21b423183721bb861ff201da33f8487e..9655cbee3d764db70bb3f83181faf7e49848b07f 100644 (file)
--- a/sys/i386/conf/XEN
+++ b/sys/i386/conf/XEN
@@ -63,6 +63,7 @@ options       WITNESS_SKIPSPIN        # Don't run witness on spinlocks for speed
 options        PAE
 nooption       NATIVE
 option         XEN
+device         xentimer
 nodevice       atpic
 nodevice       isa
 options        MCLSHIFT=12