Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp8803434rwb; Thu, 24 Nov 2022 04:38:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf6CDjZr+zEKRDcONsXjwpc+X2m5HySbyMBmCU9jgL8fMxCQQU61YYocHUn78fxIEWirMHfn X-Received: by 2002:a17:902:ee89:b0:187:1a3f:d54b with SMTP id a9-20020a170902ee8900b001871a3fd54bmr27127305pld.9.1669293482676; Thu, 24 Nov 2022 04:38:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669293482; cv=none; d=google.com; s=arc-20160816; b=G+/EzC2rMT1x7vTe0ep3G8CxCsuDydVt0EiLDQQoAq0XrHCHaQ1ommlJGNMibO8Loe xg/kLtWRXmhFG6Lb0iQNm/ErhkPwY5SA7R5E4vrZD67qpaP5ocm5XbUSkJgdbHuTurKD Cj7naMkLq8WGGCZfa30c/fwqrnLXKzPEYuq7C7HrejguDZrPYPKfcPdFPoZcPNhC50Kn W8ta4jYn1XNJ4OTWqgOngXNsFgYOcBA33N7G+RP/2wqg18L0xRBMTol0VlGjjMbnjJn+ kXpUYDe0xiJghPQWreXGJKBo6UUSBOEggcxtcOwl+aUbFt+Ak/loA82QM+JeXjBVV6IS ug1g== 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=/reZgs1mHvIik14mC34fwej5ggEtfEoagFzjrvn3iEc=; b=k7KDWmrDiHUbme76FK6Pvix+VZbtTE6jLX23LaQvf5YBWQLJceGmN6fsWNORloaCC3 nCo/cekIii4G8/f8H+DQMM2l6oPnKJZTWRMyz80QWC5zQ3Mv2tNQig0FfdI4xRfEIbzx fw04RjNAyhk8rBcBy76c/8PYuPNDBNa7uj7KEciQhA+LUMEmvmjOaxSPPMB2Apao6Mn+ Q+/2jyU0swixalGAFCmPumYr5ekrqcc9QJvKMflgMqKRZWNVZUigENarjIHcxf/MBVF5 kpVTs8CYdj2F+2DCqZ3QWMnr+sJ6IhSTGxXX/1QQixfYKKTrGdbVK+k8+1v+fTNCXszC Xe6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=BLl7NuwS; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v20-20020a63f214000000b0046edbb5b20esi1179659pgh.668.2022.11.24.04.37.51; Thu, 24 Nov 2022 04:38:02 -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=BLl7NuwS; 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 S229680AbiKXMET (ORCPT + 86 others); Thu, 24 Nov 2022 07:04:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230241AbiKXMDq (ORCPT ); Thu, 24 Nov 2022 07:03:46 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC5E267F7F; Thu, 24 Nov 2022 04:03:08 -0800 (PST) Date: Thu, 24 Nov 2022 12:03:05 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1669291386; 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=/reZgs1mHvIik14mC34fwej5ggEtfEoagFzjrvn3iEc=; b=BLl7NuwSDvPaBY/66Ul1fZSblOFyy55I6TO9pZIqWAT8KMZTVc/OrrLvTsM5qQMknrY9tU PywaGkJLt6xG7uSQTQTWLNVQhvHZe7FoiHItSie1k7/bRPce5TIrlYqqbh1Rz4Ev3KOfTN eM6wRKoE8P0MzjT8dqENWVhMDzy1SKg/Qky6t//Q67me7O6vQmS+ILiRCnBCCs59VM9KOz KG0/g19Jh6CJP6oCdaYUAttWAAI8Lb1e8bV4lA/FcLIQL9wDG2gao/gMSQbcJH7WaVcta9 onVX/zzW7zUZwbQECHbRWXQlhQCM5oQuwdm/HA/X/VMwNqbXc1LGNtThoXFFsg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1669291386; 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=/reZgs1mHvIik14mC34fwej5ggEtfEoagFzjrvn3iEc=; b=ByZ3wtqn0cyb+WMt2LJjyL9aTR5KdkL0liHd1zZnMjU1PiQmGqau93NM5CilloG2U5Anyk 4S4tfYwHWQYKNGDw== From: "tip-bot2 for Shaokun Zhang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf/x86/amd: Remove the repeated declaration Cc: Shaokun Zhang , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221108104117.46642-1-zhangshaokun@hisilicon.com> References: <20221108104117.46642-1-zhangshaokun@hisilicon.com> MIME-Version: 1.0 Message-ID: <166929138559.4906.12348858053492188552.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 The following commit has been merged into the perf/core branch of tip: Commit-ID: 634a9d5ec78ae2899725950dfb97b98ce7a2f0e4 Gitweb: https://git.kernel.org/tip/634a9d5ec78ae2899725950dfb97b98ce7a2f0e4 Author: Shaokun Zhang AuthorDate: Tue, 08 Nov 2022 18:41:17 +08:00 Committer: Peter Zijlstra CommitterDate: Thu, 24 Nov 2022 11:09:18 +01:00 perf/x86/amd: Remove the repeated declaration The function 'amd_brs_disable_all' is declared twice in commit ada543459cab ("perf/x86/amd: Add AMD Fam19h Branch Sampling support"). Remove one of them. Signed-off-by: Shaokun Zhang Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221108104117.46642-1-zhangshaokun@hisilicon.com --- arch/x86/events/perf_event.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index 6a44aed..0e849f2 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -1320,7 +1320,6 @@ void amd_brs_enable_all(void); void amd_brs_disable_all(void); void amd_brs_drain(void); void amd_brs_lopwr_init(void); -void amd_brs_disable_all(void); int amd_brs_hw_config(struct perf_event *event); void amd_brs_reset(void);