From patchwork Tue Jan 10 12:18:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 41445 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2713013wrt; Tue, 10 Jan 2023 04:21:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXs/SKWlOwznlOe0/417eqhhygvn7lBewiNcGcUynnxiKos17MS7LSrlDwPdTi6DqrPKW4FE X-Received: by 2002:a17:906:60cb:b0:84b:b481:6188 with SMTP id f11-20020a17090660cb00b0084bb4816188mr48408154ejk.64.1673353312246; Tue, 10 Jan 2023 04:21:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673353312; cv=none; d=google.com; s=arc-20160816; b=eL1mqW5jkeyiSWwV0sQlCs6KrnoHZpAA2VZ8P51lNpgRgvKxq26sjLlAhIb2qi1q6p WVGLrjlqNwYkIfZl49iZrA24PL0+gLGA5sIoABvJUtxTOhBgTIga6CZKyEz2NB7qYUQp CHeGzzpLc3CX4qRWqhF4YJgKjQ8X/5jmFH7fLtb51unredsPds/u4tdEPafiUN/uRa5a 7/LbpxctuBkqcc6LtvHYQ2em9HTuhGHvYoUYUgdF+WC2VUvcC2+DomMCvIV105y7HF1/ 4Hbjc4Zi8bGy6Cbpi3AIP6V8I4iCx4QGesoJmbhPfYn0q+moFiwfCfRMWfBDj9//WxtK 4fSQ== 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=fb5b5jauiae9ghxl1JxaYK6Ya2SY98lc1aCms5g0aRk=; b=yToVYjfjUKd+AjOoCOSWtztLAQtRO0jPZf4m4zbkRH4bEjt3SpyTEK5V0qu0gzCDxi H3OFkONpyv6dJwucXu817HC55fq4dQK4NHUm93qA9t6XQfZfRH4nkPTiVCNhlJdVHadc VT+Jyv8OMnTnnFI4cNT5UAfBvL3r886Fu6yfz1zeYQmdNWs/RPyrPlbVT10qs402ky6o YdqNqjNeOyZ0ZahqLDSGeU8Dl2lmTi90Upfd7B4bZdqVGzbq7bD0+JYp6Fkn4TFJ8tVm oVvc5ZArwJwtKZvqJnhlUnjqT9w0EMR3Zs9E6UxuJjK+k3p6cevjFjzj4MkhUsmFOQ9d RecQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=On1VSEdZ; dkim=neutral (no key) header.i=@linutronix.de; 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 xc13-20020a170907074d00b0084d7c8a4be0si3616538ejb.447.2023.01.10.04.21.28; Tue, 10 Jan 2023 04:21:52 -0800 (PST) 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=On1VSEdZ; dkim=neutral (no key) header.i=@linutronix.de; 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 S238400AbjAJMUg (ORCPT + 99 others); Tue, 10 Jan 2023 07:20:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238433AbjAJMUN (ORCPT ); Tue, 10 Jan 2023 07:20:13 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 370053AABC; Tue, 10 Jan 2023 04:18:41 -0800 (PST) Date: Tue, 10 Jan 2023 12:18:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673353119; 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=fb5b5jauiae9ghxl1JxaYK6Ya2SY98lc1aCms5g0aRk=; b=On1VSEdZla0Bmw/KcfSSyN8pkTX2ITn9TzKynwqr7BH9INMDG/Qy0dzlOQkKS1Jz+0CLLi 2XJh60gRQWkwKy+OXSwl+t9bpiIiXl4m5A4YhTLzIgdFiIZKruR5hNKOJEvp7stFXnggMz VUPzB8bntoxeDC/+zIgbn9jpyXnMvM+X6CrydDevGiKpNNizylaXFArE/mYHFvBBvZQl9E SxDIiK5k8npeXgF1BhA/hrqYLUzfvHEeQbCyAbLW670jnQRfN/ZwQVjnneSk1/zvNl5q4r b1+vKGy/mFywNczg/lnaLIJAregEn9TSxeo45gTe9FMEsHT/sBF0PbJRXErXvA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673353119; 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=fb5b5jauiae9ghxl1JxaYK6Ya2SY98lc1aCms5g0aRk=; b=3n/1cgJgSrNLpyQpQCpdyd1NSH5sbc6rqEbPCqJxSiRGJkQE+D3WubjpvyKylx69qrqmmq pbeOtVHKrjqPJDDQ== From: "tip-bot2 for Ashok Raj" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cpu] x86/cpu: Remove redundant extern x86_read_arch_cap_msr() Cc: Ashok Raj , Ingo Molnar , Daniel Sneddon , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221128172451.792595-1-ashok.raj@intel.com> References: <20221128172451.792595-1-ashok.raj@intel.com> MIME-Version: 1.0 Message-ID: <167335311946.4906.3345016453890514965.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 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?1750762385840922522?= X-GMAIL-MSGID: =?utf-8?q?1754638122360154709?= The following commit has been merged into the x86/cpu branch of tip: Commit-ID: bb5525a50601f8be7d0ffb04740e1714506e60c4 Gitweb: https://git.kernel.org/tip/bb5525a50601f8be7d0ffb04740e1714506e60c4 Author: Ashok Raj AuthorDate: Mon, 28 Nov 2022 09:24:51 -08:00 Committer: Ingo Molnar CommitterDate: Tue, 10 Jan 2023 12:40:24 +01:00 x86/cpu: Remove redundant extern x86_read_arch_cap_msr() The prototype for the x86_read_arch_cap_msr() function has moved to arch/x86/include/asm/cpu.h - kill the redundant definition in arch/x86/kernel/cpu.h and include the header. Signed-off-by: Ashok Raj Signed-off-by: Ingo Molnar Reviewed-by: Daniel Sneddon Link: https://lore.kernel.org/r/20221128172451.792595-1-ashok.raj@intel.com --- arch/x86/kernel/cpu/bugs.c | 1 + arch/x86/kernel/cpu/cpu.h | 2 -- arch/x86/kernel/cpu/tsx.c | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index bca0bd8..19e1ce0 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -33,6 +33,7 @@ #include #include #include +#include #include "cpu.h" diff --git a/arch/x86/kernel/cpu/cpu.h b/arch/x86/kernel/cpu/cpu.h index 7c9b589..57a5349 100644 --- a/arch/x86/kernel/cpu/cpu.h +++ b/arch/x86/kernel/cpu/cpu.h @@ -83,6 +83,4 @@ unsigned int aperfmperf_get_khz(int cpu); extern void x86_spec_ctrl_setup_ap(void); extern void update_srbds_msr(void); -extern u64 x86_read_arch_cap_msr(void); - #endif /* ARCH_X86_CPU_H */ diff --git a/arch/x86/kernel/cpu/tsx.c b/arch/x86/kernel/cpu/tsx.c index 8009c83..b31ee4f 100644 --- a/arch/x86/kernel/cpu/tsx.c +++ b/arch/x86/kernel/cpu/tsx.c @@ -11,6 +11,7 @@ #include #include +#include #include "cpu.h"