Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp3291448rwb; Tue, 8 Nov 2022 02:54:02 -0800 (PST) X-Google-Smtp-Source: AMsMyM7BgHk+GFOaq4JcpEC/XVjcay9O2e3y+jJZBd5VJ3tEfVhB2w8JNNon/Y1LBPQmhks8E+/7 X-Received: by 2002:a17:906:9253:b0:7ae:5a6:22f8 with SMTP id c19-20020a170906925300b007ae05a622f8mr31879902ejx.108.1667904842645; Tue, 08 Nov 2022 02:54:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667904842; cv=none; d=google.com; s=arc-20160816; b=tD0Skg/aEIWF4tuQNws5Ix8lo7mYG3kwb8ick9byYmIZVbGh2jiQP4lRbjcVvfOzEG yKaniZa8++cLUVXuut7AVjY0Lmu45OuY0zpiFrXBV9mssselniBqpjHQfELWHMdz3+1O oduiIm9G41z+7J3wDAGe+J3arc6FTPguHxJJSYB1U4zqb5XRKvN78boTPIk/NS91TEXP 1+fC6CKVNIKPt/spBhj44SFFwXp0cvYxpyXa7jpezgcXRkqT2YQ6ZldVCH8jhOsLKEvn JsQv8avemH5ws/2fByINjIt2yQomIywFWCISHOTe6uK81aK5Kw34UDu/uCpc9Iv45wyK xpVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=E4N6ZF7MH19PYnG4CiMEqjdyPUj5s/Pr/QUy6aGbXJ4=; b=V/ydPUvbaiqtk9VNTxBB7X0OpYigzIZXgv5UOyUv9JCV7zo4LmmC1ftbIFVO+z14dG f/v2kOpFz564nm4IipW25LAI5O0AoXyj8MNJbFovgEY+jYL2xPjIZawhne9wsiJbmoPv CbzCkFW+NixibzZTXrd2HmaGR3vIaY2FkYJ8UQh99Phg7vQOMNp8KT9PCsGk6OZaBNrM wf+aSZfM0LMT3NovMSIdoNpLrrsE2Lms5za1xjYxRAOnH2FEvIibSXx9G24UcHyscg09 RitLB8EeIxmuQBgMSx7ZTHXPDHJWiDh9GjgJgoM2VudoaWxg3fWcpz19nTF+f9Z9ZkvF dEMg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cx6-20020a05640222a600b00461b661d906si11312454edb.256.2022.11.08.02.53.41; Tue, 08 Nov 2022 02:54: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; 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=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233821AbiKHKkx (ORCPT + 89 others); Tue, 8 Nov 2022 05:40:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34250 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233856AbiKHKkw (ORCPT ); Tue, 8 Nov 2022 05:40:52 -0500 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C873317EF for ; Tue, 8 Nov 2022 02:40:50 -0800 (PST) Received: from dggpeml500023.china.huawei.com (unknown [172.30.72.57]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4N64PN4p8szHvdx; Tue, 8 Nov 2022 18:40:24 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 8 Nov 2022 18:40:48 +0800 From: Shaokun Zhang To: CC: Shaokun Zhang , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Stephane Eranian Subject: [PATCH] perf/x86/amd: Remove the repeated declaration Date: Tue, 8 Nov 2022 18:41:17 +0800 Message-ID: <20221108104117.46642-1-zhangshaokun@hisilicon.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.69.192.56] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500023.china.huawei.com (7.185.36.114) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,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 function 'amd_brs_disable_all' is declared twice in commit ada543459cab ("perf/x86/amd: Add AMD Fam19h Branch Sampling support"). Remove one of them. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Stephane Eranian Signed-off-by: Shaokun Zhang --- 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 332d2e6d8ae4..2aaa492b70b2 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -1322,7 +1322,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); -- 2.33.0