Content-Type: multipart/mixed; boundary="===============1390710879385065808==" MIME-Version: 1.0 From: Kim Phillips To: kbuild-all@lists.01.org Subject: [PATCH] perf/amd: Fix i386 build error: redefinition of 'get_ibs_caps' Date: Wed, 18 Aug 2021 12:29:35 -0500 Message-ID: <20210818172935.54392-1-kim.phillips@amd.com> In-Reply-To: <202108182341.z6digIOK-lkp@intel.com> List-Id: --===============1390710879385065808== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 mo= dule") Reported-by: kernel test robot Signed-off-by: Kim Phillips Cc: Peter Zijlstra Cc: linux-kernel(a)vger.kernel.org Cc: kbuild-all(a)lists.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) +=3D core.o ibs.o +obj-$(CONFIG_CPU_SUP_AMD) +=3D core.o obj-$(CONFIG_PERF_EVENTS_AMD_POWER) +=3D power.o +obj-$(CONFIG_X86_LOCAL_APIC) +=3D ibs.o obj-$(CONFIG_PERF_EVENTS_AMD_UNCORE) +=3D amd-uncore.o amd-uncore-objs :=3D uncore.o ifdef CONFIG_AMD_IOMMU -- = 2.31.1 --===============1390710879385065808==--