From a101f0994b6566e7b589bd1302c95a38591fc8fc Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Tue, 14 Jan 2014 01:41:14 +0000 Subject: [PATCH 07/48] xen/timer: Make xen timer optional The timer is not used on ARM. --- sys/amd64/conf/GENERIC | 4 +++- sys/conf/files | 2 +- sys/i386/conf/GENERIC | 4 +++- sys/i386/conf/XEN | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index c8d5098..202b447 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -354,9 +354,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 77a619d..4c293ea 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2639,7 +2639,7 @@ dev/xen/control/control.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 889a20a7f..ae81334 100644 --- 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 108224c..9a2fb20 100644 --- a/sys/i386/conf/XEN +++ b/sys/i386/conf/XEN @@ -60,6 +60,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 -- 2.1.0