linux-kernel - [tip: perf/core] perf/x86/amd: Remove the repeated declaration

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <166929138559.4906.12348858053492188552.tip-bot2@tip-bot2>
Date:   Thu, 24 Nov 2022 12:03:05 -0000
From:   "tip-bot2 for Shaokun Zhang" <tip-bot2@...utronix.de>
To:     linux-tip-commits@...r.kernel.org
Cc:     Shaokun Zhang <zhangshaokun@...ilicon.com>,
        "Peter Zijlstra (Intel)" <peterz@...radead.org>, x86@...nel.org,
        linux-kernel@...r.kernel.org
Subject: [tip: perf/core] perf/x86/amd: Remove the repeated declaration

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 <zhangshaokun@...ilicon.com>
AuthorDate:    Tue, 08 Nov 2022 18:41:17 +08:00
Committer:     Peter Zijlstra <peterz@...radead.org>
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 <zhangshaokun@...ilicon.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
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);