From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754100AbcBAPmx (ORCPT ); Mon, 1 Feb 2016 10:42:53 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:19285 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752756AbcBAPkI (ORCPT ); Mon, 1 Feb 2016 10:40:08 -0500 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, roger.pau@citrix.com, mcgrof@suse.com, 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> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1454341137-14110-1-git-send-email-boris.ostrovsky@oracle.com> References: <1454341137-14110-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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