From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: [PATCH v2 09/11] xen/hvmlite: Use x86's default timer init for HVMlite guests Date: Mon, 1 Feb 2016 10:38:55 -0500 Message-ID: <1454341137-14110-10-git-send-email-boris.ostrovsky@oracle.com> References: <1454341137-14110-1-git-send-email-boris.ostrovsky@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQGaE-0003D9-Pj for xen-devel@lists.xenproject.org; Mon, 01 Feb 2016 15:40:06 +0000 In-Reply-To: <1454341137-14110-1-git-send-email-boris.ostrovsky@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: Boris Ostrovsky , xen-devel@lists.xenproject.org, mcgrof@suse.com, linux-kernel@vger.kernel.org, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org xen_timer_init() will be called from apic_bsp_setup(). Signed-off-by: Boris Ostrovsky --- arch/x86/xen/time.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index f1ba6a0..d77b398 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -492,7 +492,10 @@ void __init xen_init_time_ops(void) { pv_time_ops = xen_time_ops; - x86_init.timers.timer_init = xen_time_init; + if (!xen_hvmlite) + x86_init.timers.timer_init = xen_time_init; + else + x86_init.timers.timer_init = x86_init_noop; x86_init.timers.setup_percpu_clockev = x86_init_noop; x86_cpuinit.setup_percpu_clockev = x86_init_noop; -- 1.7.1