linux-kernel - [PATCH] perf/amd: Fix i386 build error: redefinition of 'get_ibs

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 for Android: free password hash cracker in your pocket

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

Message-Id: <20210818172935.54392-1-kim.phillips@amd.com>
Date:   Wed, 18 Aug 2021 12:29:35 -0500
From:   Kim Phillips <kim.phillips@....com>
To:     kernel test robot <lkp@...el.com>
Cc:     Kim Phillips <kim.phillips@....com>,
        Peter Zijlstra <peterz@...radead.org>,
        linux-kernel@...r.kernel.org, kbuild-all@...ts.01.org
Subject: [PATCH] perf/amd: Fix i386 build error: redefinition of 'get_ibs_caps'

Commit 6c3f8af52cfc ("perf/amd/uncore: Allow the driver to be
built as a module") accidentally contained some unwanted ibs.o
Makefile dependency changes.  Undo them, and leave just the
uncore.o changes needed by the commit.

Fixes: 6c3f8af52cfc ("perf/amd/uncore: Allow the driver to be built as a module")
Reported-by: kernel test robot <lkp@...el.com>
Signed-off-by: Kim Phillips <kim.phillips@....com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: linux-kernel@...r.kernel.org
Cc: kbuild-all@...ts.01.org
---
 arch/x86/events/amd/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/events/amd/Makefile b/arch/x86/events/amd/Makefile
index ec45a12deb8b..6cbe38d5fd9d 100644
--- a/arch/x86/events/amd/Makefile
+++ b/arch/x86/events/amd/Makefile
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_CPU_SUP_AMD)		+= core.o ibs.o
+obj-$(CONFIG_CPU_SUP_AMD)		+= core.o
 obj-$(CONFIG_PERF_EVENTS_AMD_POWER)	+= power.o
+obj-$(CONFIG_X86_LOCAL_APIC)		+= ibs.o
 obj-$(CONFIG_PERF_EVENTS_AMD_UNCORE)	+= amd-uncore.o
 amd-uncore-objs				:= uncore.o
 ifdef CONFIG_AMD_IOMMU
-- 
2.31.1