Received: by 2002:a25:8b12:0:0:0:0:0 with SMTP id i18csp661138ybl; Wed, 28 Aug 2019 03:31:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqyVqpjHDo+hYSiIwshJlgGV6bjHzxVmcmAxO/byBv2sySltiCq1YQhwOL5WbyZu6b/BKhiY X-Received: by 2002:a63:1e06:: with SMTP id e6mr2752312pge.185.1566988305762; Wed, 28 Aug 2019 03:31:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566988305; cv=none; d=google.com; s=arc-20160816; b=eccE21TJNa/llnTwJuBS1DliZzbEKm5gvCgSFnWavm55BK1GkQ72zDRpbHmxaZctM+ TK+mZHqW8OSP4cHJI4JOQqzbcLDkwFDjXT3PAampB1glNDbQgsSeCU03vXEO4EG4m8ZW zJMW+VxM1ocni3b0FugW3oK2kPNIMaRNjFeZUYOpiRmusOGYM75sfPB4PT0FtxcPK2wk t8zGsMAQP5WJC6XGhUmcUbsl0H6gwvY/9XimkHNeiTJGbvUaD81TRYRE6mHTnyZrmS8n G5PpbQnIzgxSz/m4Rwqcf+pw0RF2Wc7BWcCa6yUsoEBvMIGsLPJH2cFdmF83MJkuAlBH jlbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=4+GZjvw7OgD6J4w8YFqfx9CbHKnIJ9J+SHEFhD1RuN8=; b=JLSla8IAA0qYz0pFK1u/CzUza8YxJ0pjPNtKa0Dp1ipc+2i//5qZ+8cmNExFbhTMTM p81SovhkQ5tvNt73dS2m5MkXQQ4u8P4DjUEqRfqUAB4C0RoWJ3cWLEOidrgK3RgbGRBd DIlqEdC5INV+pYjBs8jkxhteCapclkNaMe4c0s9qjR8SKgIL8BEyJ1E1xkhOR/jc6Q5G lzbMhcS8lgDXiNvZci3J1xiOXxoBNzythjPY007zr07rIfuapow0RcvTzIt6/1k3S9Fo 5t0WN6vRM8Ws9xFLvSZ13bT835pymFwt0PuxLokFk5hqIiNeR7ECMUfcb4LCy53TWmTM 6QPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ba11si1595385plb.162.2019.08.28.03.31.29; Wed, 28 Aug 2019 03:31:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726440AbfH1KaM (ORCPT + 99 others); Wed, 28 Aug 2019 06:30:12 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:46547 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726315AbfH1KaL (ORCPT ); Wed, 28 Aug 2019 06:30:11 -0400 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1i2vDL-0000vr-EB; Wed, 28 Aug 2019 12:30:07 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id EF47B1C07D2; Wed, 28 Aug 2019 12:30:06 +0200 (CEST) Date: Wed, 28 Aug 2019 10:30:06 -0000 From: "tip-bot2 for Tianyu Lan" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] x86/hyperv: Hide pv_ops access for CONFIG_PARAVIRT=n Cc: Tianyu Lan , Thomas Gleixner , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org In-Reply-To: <20190828080747.204419-1-Tianyu.Lan@microsoft.com> References: <20190828080747.204419-1-Tianyu.Lan@microsoft.com> MIME-Version: 1.0 Message-ID: <156698820683.8007.9582744413346389871.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the timers/core branch of tip: Commit-ID: 41cfe2a2a7f4fad5647031ad3a1da166452b5437 Gitweb: https://git.kernel.org/tip/41cfe2a2a7f4fad5647031ad3a1da166452b5437 Author: Tianyu Lan AuthorDate: Wed, 28 Aug 2019 16:07:47 +08:00 Committer: Thomas Gleixner CommitterDate: Wed, 28 Aug 2019 12:25:06 +02:00 x86/hyperv: Hide pv_ops access for CONFIG_PARAVIRT=n hv_setup_sched_clock() references pv_ops which is only available when CONFIG_PARAVIRT=Y. Wrap it into a #ifdef Signed-off-by: Tianyu Lan Signed-off-by: Thomas Gleixner Link: https://lkml.kernel.org/r/20190828080747.204419-1-Tianyu.Lan@microsoft.com --- arch/x86/kernel/cpu/mshyperv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index 53afd33..267daad 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -346,7 +346,9 @@ static void __init ms_hyperv_init_platform(void) void hv_setup_sched_clock(void *sched_clock) { +#ifdef CONFIG_PARAVIRT pv_ops.time.sched_clock = sched_clock; +#endif } const __initconst struct hypervisor_x86 x86_hyper_ms_hyperv = {