From patchwork Thu Nov 24 12:03:05 2022 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: 25485 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3356053wrr; Thu, 24 Nov 2022 04:08:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf4lARRsD1mLhdm8eu22j+1X428yK0XUZgJQK3Mbo+jhPPYCnCf36eUvvG/dHc9KcmCnShj8 X-Received: by 2002:aa7:cb96:0:b0:461:bacd:c85d with SMTP id r22-20020aa7cb96000000b00461bacdc85dmr28732808edt.278.1669291696771; Thu, 24 Nov 2022 04:08:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669291696; cv=none; d=google.com; s=arc-20160816; b=TXsKSJnYGjuFPUFNQw9ULoxyR09sSa7iA2FyB2MiT7HxBpTcHYhAZg2gzFJGYLlcbO Yi5hF7FAcDNlVwHrDeAfZLfab8mk704caYqNZADDGa20Ii1MAXKtTvt/8HGszOj2Pkli Ayz/naLpXiIANylBPKoHV2yEV3m1Zzwv/9RIkJSDW+SzcxPInsFpa+b2hjzTH6R5VHi4 oHzDYibt+YPi9Tl8WopOZ1R0WOumiiKkyli2/YSUIUd2thcpQa747geZS4EVRNDENr64 Xs+87nAieRGQha5rybwVQYA5oa0pSnI/eq5orot+rCKl4BH5eyCd2AOHtUygl6O7RoEx PPBg== 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 header.s=2020e; 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 be16-20020a0564021a3000b0046184b7c4besi377691edb.462.2022.11.24.04.07.52; Thu, 24 Nov 2022 04:08:16 -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 header.s=2020e; 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 + 99 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 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?1748924914229428771?= X-GMAIL-MSGID: =?utf-8?q?1750379210406539416?= 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);