From patchwork Thu Oct 20 14:13:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 6218 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp137343wrr; Thu, 20 Oct 2022 07:18:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM531/QhfcO5JsECvGGXDvYgkcbXQX4jJXW1zcyvHSljyW4HQReE8kpO/TRwRRQV02vhNvSt X-Received: by 2002:a05:6402:1604:b0:458:b2b7:bd5a with SMTP id f4-20020a056402160400b00458b2b7bd5amr11951444edv.73.1666275530815; Thu, 20 Oct 2022 07:18:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666275530; cv=none; d=google.com; s=arc-20160816; b=K88PyMNUsRxrCTeBosYoObD3ka12IP+Z8pxyWcULFURi+/Q95btxBxXXz2oAfFcsBR ABPF1009KXH3nfAMYxcoeHibkNpeUnOS1s8zJ5HpTfDQ3ZBcKRPHDGl7b4ZlM8AV2FSW PmRJ0a1hESxic5tOm4dhd1Lakn6sNMohg8pKPoie8AGXo1wjTJwv5U6Ok/VX9VmEAuZu 4XDJW5KKxaIBh/PBtecyIxzkD8ZoGl//c3cJzxIbkH6c2UA1G+W5yWVXTxjZETVCT4Xc T19xLtUyRB8BwmEEWoZtQi8lrnywij9e0p5/t4jsz3DUK+DvOtoTRdtWVQFRSMuW0U2A YzMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=ObeAeeAOvdgHTvRViRSMWDjpDb0JcMd6Lt070o+on5I=; b=UAIDxTE7MxWW2t10eXm/y62FI8zaGIXtRWjM39oFdk/F49rtefkZqNcovThC+brq32 REgpc8xAbdmBv7HuYVK7VWzl30g7CY7zRQl8OYFPNlr6oUKeToN+08lWD45xrzWbkZVQ laPFuNPWZ8hwdGUj1RetVaR5BzNEkT9T255RdFR44FyzfFGAthW3KUly8/1RQKZWE0E+ ONU0E9KAAu1dXo1VuABusi58jGMe3LWNRydIz8OycEiHOhJHbJTJRJXLeS882gcotV1Y yJfxWOcQp0Jx0k1sEADpkcIaI/6cFrIMdRznDGeJPg9x6XHGOJ4d9CMuqRuX2xVH1MLc Pllw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="dFMi/P8O"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=YvJ25f8T; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qb36-20020a1709077ea400b0078d00203ab2si17900839ejc.41.2022.10.20.07.18.15; Thu, 20 Oct 2022 07:18:50 -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=@linutronix.de header.s=2020 header.b="dFMi/P8O"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=YvJ25f8T; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229987AbiJTONu (ORCPT + 99 others); Thu, 20 Oct 2022 10:13:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229823AbiJTONs (ORCPT ); Thu, 20 Oct 2022 10:13:48 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36A3C1DB8AE; Thu, 20 Oct 2022 07:13:47 -0700 (PDT) Date: Thu, 20 Oct 2022 14:13:42 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1666275224; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ObeAeeAOvdgHTvRViRSMWDjpDb0JcMd6Lt070o+on5I=; b=dFMi/P8OBE4iP/PueTQ5lOORh7/r/4yiWzpqaKXfxmqIxhlx3uUc9i/djBzr7DxXN49nXW TNZyaab3zE4d/8jagN4qYsgBSKq/GCXtFsIlHeDLmPXz7N5AteEPQpswOa8K8748M9LNxC 0jnOyX7WjrNiVjJr26g/Ar7LfN5BQ7T+I5D2gsx52Xq9FzTFm74tjsxHd+G7KyrxjC8pMl Gk3PR4WFuWRKd9V941ESztI6FYsgLRO/yxqZXN75dadjN4ePniPGWHAJcUvPcMN+85zrBs so6dlZnkAAr5ZmzaT2g/SpTMzkhT/nWkg7ZpwmA9p//qinF8SihjHnv6a1DJtw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1666275224; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ObeAeeAOvdgHTvRViRSMWDjpDb0JcMd6Lt070o+on5I=; b=YvJ25f8Tg8lYzSI+PpJVIj6l6FhfMzF+/cpDoGHvZqRjifIBDxjskmSRB5t/zJmu8BbiJf mzwpTSD7VPAizYCg== From: "tip-bot2 for Borislav Petkov" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/paravirt: Fix a !PARAVIRT build warning Cc: Borislav Petkov , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <166627522295.401.15571888009057472602.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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?1747136804856153630?= X-GMAIL-MSGID: =?utf-8?q?1747216531384735556?= The following commit has been merged into the x86/core branch of tip: Commit-ID: dbf53a29b28b277fa952a000245b558536c6bdd7 Gitweb: https://git.kernel.org/tip/dbf53a29b28b277fa952a000245b558536c6bdd7 Author: Borislav Petkov AuthorDate: Wed, 19 Oct 2022 18:59:45 +02:00 Committer: Peter Zijlstra CommitterDate: Thu, 20 Oct 2022 16:00:59 +02:00 x86/paravirt: Fix a !PARAVIRT build warning Fix ./include/trace/events/xen.h:28:31: warning: ‘enum paravirt_lazy_mode’ \ declared inside parameter list will not be visible outside of this definition or declaration which turns into a build error: ./include/trace/events/xen.h:28:50: error: parameter 1 (‘mode’) has incomplete type 28 | TP_PROTO(enum paravirt_lazy_mode mode), \ due to enum paravirt_lazy_mode being visible only under CONFIG_PARAVIRT. Just pull it up where it is unconditionally visible. Signed-off-by: Borislav Petkov Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/Y1AtAXM8YjtBm2cj@zn.tnic --- arch/x86/include/asm/paravirt_types.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h index e137d94..27c6927 100644 --- a/arch/x86/include/asm/paravirt_types.h +++ b/arch/x86/include/asm/paravirt_types.h @@ -9,6 +9,13 @@ struct paravirt_patch_site { u8 type; /* type of this instruction */ u8 len; /* length of original instruction */ }; + +/* Lazy mode for batching updates / context switch */ +enum paravirt_lazy_mode { + PARAVIRT_LAZY_NONE, + PARAVIRT_LAZY_MMU, + PARAVIRT_LAZY_CPU, +}; #endif #ifdef CONFIG_PARAVIRT @@ -582,13 +589,6 @@ int paravirt_disable_iospace(void); __PVOP_VCALL(op, PVOP_CALL_ARG1(arg1), PVOP_CALL_ARG2(arg2), \ PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4)) -/* Lazy mode for batching updates / context switch */ -enum paravirt_lazy_mode { - PARAVIRT_LAZY_NONE, - PARAVIRT_LAZY_MMU, - PARAVIRT_LAZY_CPU, -}; - enum paravirt_lazy_mode paravirt_get_lazy_mode(void); void paravirt_start_context_switch(struct task_struct *prev); void paravirt_end_context_switch(struct task_struct *next);