From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33B8DC433EF for ; Fri, 18 Feb 2022 22:18:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240089AbiBRWTK (ORCPT ); Fri, 18 Feb 2022 17:19:10 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:53566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232331AbiBRWTI (ORCPT ); Fri, 18 Feb 2022 17:19:08 -0500 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B07471EAFE for ; Fri, 18 Feb 2022 14:18:51 -0800 (PST) Received: by mail-pg1-x549.google.com with SMTP id k13-20020a65434d000000b00342d8eb46b4so5380336pgq.23 for ; Fri, 18 Feb 2022 14:18:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=pVXJc061TtsoEtD7PMBvnKKXs8wiB3Pj+BQh/nz39ZM=; b=PWhchmhruRHRbpXpRMLRPHFK1XFQmqchFlS47gdcy11C7pj0SAgu1vuOk3S7M2/dhG fDkhDUlMuWp+bwxAFYUAgv2ApKkxxdEDzQQGsKMkcFTt4Pg1BSJeBd99+BDxC7UAoD6r j4MC+1BQNrKJznA5j2wh2d+gP7bg+UNEl91HHlMltRfW8tpM17N6wYqIpGvNSQEN0vYS HX0bdQfvsGenBUR2mXk3u3a+nf1BBPjFrVa53Y6kPC18OI/57+zxG9ViTOl16AUY9A5Z 43PMlWfQ+UHzllEcmsnhDk4scx1pAsY79MnCH6z8VEVCGxSK8PouWYFkq2XmeVrgJSlY +bBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=pVXJc061TtsoEtD7PMBvnKKXs8wiB3Pj+BQh/nz39ZM=; b=YGxux+W20QTbbPkfjT86K13Qi+BGwpWTkc6tRcs+h3NFrk0wJACD7S0kUTjILE0ELI cgLScsOJTDtyIhb0GnM7G0K2Klsycv9S2MqQWPzzogDL3EflTSuKKkIAvxmRMr7fxukz 5HaxmHEoFzp+ApjB0JGFL8jLIajv5bM/J0td+lSm4RoFsLH2FsTvUYSdLOzD24nLi4yR Hhh9Gvksi3hyzx3ZQnliz40mDT8Jdp0EVOAvxaqRvLSKym3LPtj9eOk5usY7xsTLIKXP +w7mqdWw248BaeMFg6pSvOYXHZmTOYOCwCnb90fW0/gP3nyAVk9397vX27pMcWOUqHz8 46lw== X-Gm-Message-State: AOAM531CN3FQXaPg3+XUN/59p9FifvV15kdZZUwks4oEqqOf5PaebNRG oLhyq5KgAd6LoNwQOHRnryMScSCMRA== X-Google-Smtp-Source: ABdhPJwGJGkbPMPTEtL4lszTVj6AH0AbHHyVr2JbcSJs6spkuSyd8Mab+dX/jIBFHpH5OLQj3Dy/0W4HAQ== X-Received: from swine1.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:42e]) (user=swine job=sendgmr) by 2002:a17:90b:3a85:b0:1b9:e751:2335 with SMTP id om5-20020a17090b3a8500b001b9e7512335mr14644881pjb.43.1645222731098; Fri, 18 Feb 2022 14:18:51 -0800 (PST) Date: Fri, 18 Feb 2022 14:18:19 -0800 Message-Id: <20220218221820.950118-1-swine@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.35.1.473.g83b2b277ed-goog Subject: [PATCH 1/2] kvm/x86: rename kvm's read_tsc() as kvm_read_host_tsc() From: Pete Swain To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: "H. Peter Anvin" , Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , John Stultz , Stephen Boyd , "Maciej W. Rozycki" , Johan Hovold , Feng Tang , "Paul E. McKenney" , Juergen Gross , linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Pete Swain Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid clash with host driver's INDIRECT_CALLABLE_SCOPE read_tsc() Signed-off-by: Pete Swain --- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 641044db415d..0424d77cd214 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2632,7 +2632,7 @@ static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment) #ifdef CONFIG_X86_64 -static u64 read_tsc(void) +static u64 kvm_read_host_tsc(void) { u64 ret = (u64)rdtsc_ordered(); u64 last = pvclock_gtod_data.clock.cycle_last; @@ -2674,7 +2674,7 @@ static inline u64 vgettsc(struct pvclock_clock *clock, u64 *tsc_timestamp, break; case VDSO_CLOCKMODE_TSC: *mode = VDSO_CLOCKMODE_TSC; - *tsc_timestamp = read_tsc(); + *tsc_timestamp = kvm_read_host_tsc(); v = (*tsc_timestamp - clock->cycle_last) & clock->mask; break; -- 2.35.1.473.g83b2b277ed-goog