From patchwork Tue Apr 18 05:12:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saurabh Singh Sengar X-Patchwork-Id: 84573 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2593423vqo; Mon, 17 Apr 2023 22:19:39 -0700 (PDT) X-Google-Smtp-Source: AKy350bgv61lYSZKpRUtvA5UD9vvnsU2I2GSZdrsGIrSaSaqSW6hzW6wTHOQFcM9RZbD9TOF6OoS X-Received: by 2002:a05:6a00:2d28:b0:63b:8963:d952 with SMTP id fa40-20020a056a002d2800b0063b8963d952mr8230968pfb.17.1681795179137; Mon, 17 Apr 2023 22:19:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681795179; cv=none; d=google.com; s=arc-20160816; b=l9nFD/92ndK1r1EYeC8DcnowqnGw+f2+T+6W9CWnUlrdVB6Z1g76IhGJM1kWRjRuIv MXR5I94zeXgtpj8M/X9DpjgcyY7NqZttmmPCj5ITBCp4HuMVSDn2pji7dqmAvZdeEtnp ABleyLnN/w7HHoMOwNLuyf2Mtzpdg6OQy7cGE8V6FwWQJqHEVeAOfzaW3q+tgMDGh0RE sYtTDIzFvtFf2KG3O+46FdU4VAAu9Raa23samdjPaEIZ1exUI7Lihn9uFNtwex+/OnIY KJMPujQJ+0DsGJx69NYuqfo4JhZMj6/1aeJ8HwCLmZ598R43aQJS7Wi7vcHlVKcCUMeb uzKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:dkim-filter; bh=jAe5ydWTNaBvjnqbWCKOjRz2xmpIzgRM0wkNQjWgDoM=; b=oHpaT4tezwl7y1EqNtPk7X28NP6JUbFBghZpRngY0nACDP7xL5sYcnGYUJyR+jOzOu S0cgn/TUepJZSQIb499CFWwdVXXDLkifz+JLyVw+yAb+2EVo6GOnGSkb5TcJnfnLsiZU EgbrIV2cDIBJVLOC1FQVbEj66HxfWH/rRq1RYy9S+wwsZl3IM6LcSKpHZE0SQZ+x4OG3 dZZwCGDO5baMBMTVxPHD7SYTumXG/+DnmW7OOV6RbgM/5OXyze5beMDWVprLrFOtZaY+ dheCC0pdqbTYjD8SlqZ3CokfLvs3tUrlu8uE2a93D/NghEG6WyQao1PqpXhS4dFm1dp4 KKpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=M1HbQmdk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w8-20020a627b08000000b0063d238b6049si3637278pfc.286.2023.04.17.22.19.26; Mon, 17 Apr 2023 22:19:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=M1HbQmdk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230094AbjDRFMu (ORCPT + 99 others); Tue, 18 Apr 2023 01:12:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229619AbjDRFMq (ORCPT ); Tue, 18 Apr 2023 01:12:46 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B592C40E5; Mon, 17 Apr 2023 22:12:45 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 233DF21C2021; Mon, 17 Apr 2023 22:12:45 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 233DF21C2021 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1681794765; bh=jAe5ydWTNaBvjnqbWCKOjRz2xmpIzgRM0wkNQjWgDoM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=M1HbQmdkh286aS7vXOm/VGrSIsRx5j5E/wDDmJhwVROFq3SyXkAJt9KzlJWC0x1JC SkFi1feXV7u+TT1BZ6eex2R8bQPtnxVu6gmPqnNudI4HCfh+hWzbIYKF/JIOVzX/M9 nY+CoQcZKYNQrf8lYZLicw7Mg0OuI9f9Otnafe0s= From: Saurabh Sengar To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, tiala@microsoft.com, mikelley@microsoft.com, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org Subject: [PATCH 1/2] x86/init: Remove static for get/set_rtc_noop() Date: Mon, 17 Apr 2023 22:12:40 -0700 Message-Id: <1681794761-13734-2-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1681794761-13734-1-git-send-email-ssengar@linux.microsoft.com> References: <1681794761-13734-1-git-send-email-ssengar@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763490061626214875?= X-GMAIL-MSGID: =?utf-8?q?1763490061626214875?= Remove static from get/set_rtc_noop() so that it can be accessed outside of the file. Signed-off-by: Saurabh Sengar --- arch/x86/kernel/x86_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index ecdeb0974a87..d82f4fa2f1bf 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -33,8 +33,8 @@ static int __init iommu_init_noop(void) { return 0; } static void iommu_shutdown_noop(void) { } bool __init bool_x86_init_noop(void) { return false; } void x86_op_int_noop(int cpu) { } -static int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; } -static void get_rtc_noop(struct timespec64 *now) { } +int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; } +void get_rtc_noop(struct timespec64 *now) { } static __initconst const struct of_device_id of_cmos_match[] = { { .compatible = "motorola,mc146818" }, From patchwork Tue Apr 18 05:12:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saurabh Singh Sengar X-Patchwork-Id: 84572 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2592705vqo; Mon, 17 Apr 2023 22:17:37 -0700 (PDT) X-Google-Smtp-Source: AKy350ZZg+mQWWvLypuz9KGTJxTv4BlCr7RFTFmV1K1cJxkUdeahSK2z4g1vT0jClJj1tGqvL3T9 X-Received: by 2002:a05:6a00:16c1:b0:636:4523:da93 with SMTP id l1-20020a056a0016c100b006364523da93mr25562494pfc.12.1681795057670; Mon, 17 Apr 2023 22:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681795057; cv=none; d=google.com; s=arc-20160816; b=tEG1kMhRmYz2awwh7+Ms7oKTDbFw55TooHwfPWE7X9BeHwsQrTvEdrEgkaEson3Ud0 gWKK2bgIcELMgktnpIrcE80QEOb+nI9Yy3e81o5RBCbWytWkw3AZzS9nxtwazn0U2ri/ 36pglnxfOR3MRAXwhgYIjGaSq2/VAMG9VLCkVmyeCAy+Fo0wHV7iyZ/WqKdT/74ybiFt rK/QZg6B5mO7L2CRkfwvoRVSnoJWS7uC1t1pbwSc9NFWDREmIg2wf4/34RCEr2CfLHNL iEPYbpzy8op4gom2sI924yRukwQgtJQtG/1RHfCL/70GMbsPCFm1YfUyXvXyZ8MabdgG +jhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :to:from:dkim-signature:dkim-filter; bh=yRj88ka13GJpMg/3bI23hbHOSkGkGWzPUVOA10JufYg=; b=VheCUc8mGI0b6NOamr0sfKThvb0+8vexEDc8MEeIYGyS7o7TmPug4XUJgBsctMKrNr iXZ0QDq0aaIxg1EVE8fbTbzHpQMlop/UNrk+6KhvzIVQX3/15rEZlatET9m9++5ye7SQ FR6ATYy9axLintbD7zOgYhx6CskRdOzWnCHTOxdwSGXNN3eGUGo2LtFErYoLVl4Om3G8 g3hmVQVCrli0Oad52VgQy/sRISyRgQ2LCavm7hEyUSlqAd99RjCAmsO3sWQb1ixqUIEL cd7JbuU4a9IbN/oEQBa8ZwAw8tOGR4mKffMs+O4AO1vyC02SV0iZsC0IrBUQpU0jVFR/ pU1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=fKigXjiB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p129-20020a622987000000b0063b5875dd22si12046062pfp.308.2023.04.17.22.17.23; Mon, 17 Apr 2023 22:17:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.microsoft.com header.s=default header.b=fKigXjiB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linux.microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229872AbjDRFMs (ORCPT + 99 others); Tue, 18 Apr 2023 01:12:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjDRFMq (ORCPT ); Tue, 18 Apr 2023 01:12:46 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id B7ACB40F0; Mon, 17 Apr 2023 22:12:45 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 3C13F21C2022; Mon, 17 Apr 2023 22:12:45 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 3C13F21C2022 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1681794765; bh=yRj88ka13GJpMg/3bI23hbHOSkGkGWzPUVOA10JufYg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fKigXjiBAJm9oUvMTmHO6KKqyaFUZCLKgwRTpsI75WUpZhc3DVs9fhAgGoE2P8Uy6 1MdWHoicjJos+BkgKZDIIDz20G1z30Y6soO1go1ti8UUGi5vZB2fr+KpSFcL0XCS1Z RibdynS6ROLvWkVRZpCfPE6JETAwNZuRHXmtO+cE= From: Saurabh Sengar To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, tiala@microsoft.com, mikelley@microsoft.com, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org Subject: [PATCH 2/2] x86/hyperv: Allow hv_get_nmi_reason compilation irrespective of HYPERV config Date: Mon, 17 Apr 2023 22:12:41 -0700 Message-Id: <1681794761-13734-3-git-send-email-ssengar@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1681794761-13734-1-git-send-email-ssengar@linux.microsoft.com> References: <1681794761-13734-1-git-send-email-ssengar@linux.microsoft.com> X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL, USER_IN_DEF_SPF_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763489934045880092?= X-GMAIL-MSGID: =?utf-8?q?1763489934045880092?= Move hv_get_nmi_reason out of CONFIG_HYPERV guard, so that it can be compiled irrespective of CONFIG_HYPERV enabled or not. Signed-off-by: Saurabh Sengar --- arch/x86/include/asm/mshyperv.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index 71ed240ef66d..67f8386c1775 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -29,6 +29,11 @@ typedef int (*hyperv_fill_flush_list_func)( void hyperv_vector_handler(struct pt_regs *regs); +static inline unsigned char hv_get_nmi_reason(void) +{ + return 0; +} + #if IS_ENABLED(CONFIG_HYPERV) extern int hyperv_init_cpuhp; @@ -189,11 +194,6 @@ static inline struct hv_vp_assist_page *hv_get_vp_assist_page(unsigned int cpu) return hv_vp_assist_page[cpu]; } -static inline unsigned char hv_get_nmi_reason(void) -{ - return 0; -} - void __init hyperv_init(void); void hyperv_setup_mmu_ops(void); void set_hv_tscchange_cb(void (*cb)(void));