From: Julien Grall Date: Tue, 14 Jan 2014 01:41:14 +0000 (+0000) Subject: xen/timer: Make xen timer optional X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=17eb5fdedd100c5e293cf614789d2d2278e6eb5b;p=people%2Fjulieng%2Ffreebsd.git 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 5c7f7c035f43..ff36645f5df8 100644 --- 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 3ddf41287a09..2fa020e97a01 100644 --- 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 dc11f73c4302..a17e45df5f44 100644 --- 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