From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753481AbdA3Nou (ORCPT ); Mon, 30 Jan 2017 08:44:50 -0500 Received: from terminus.zytor.com ([65.50.211.136]:52278 "EHLO mail.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753406AbdA3Nol (ORCPT ); Mon, 30 Jan 2017 08:44:41 -0500 Date: Mon, 30 Jan 2017 04:01:46 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, bp@suse.de, eranian@google.com, jolsa@redhat.com, torvalds@linux-foundation.org, alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, peterz@infradead.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com Reply-To: jolsa@redhat.com, eranian@google.com, torvalds@linux-foundation.org, hpa@zytor.com, tglx@linutronix.de, acme@redhat.com, peterz@infradead.org, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, bp@suse.de, mingo@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20170126080819.417-1-bp@alien8.de> References: <20170126080819.417-1-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86/events: Add an AMD-specific Makefile Git-Commit-ID: 612f0c0b859ee99f800dc88ad470d938d90ad111 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 612f0c0b859ee99f800dc88ad470d938d90ad111 Gitweb: http://git.kernel.org/tip/612f0c0b859ee99f800dc88ad470d938d90ad111 Author: Borislav Petkov AuthorDate: Thu, 26 Jan 2017 09:08:19 +0100 Committer: Ingo Molnar CommitDate: Mon, 30 Jan 2017 12:01:19 +0100 perf/x86/events: Add an AMD-specific Makefile Move the AMD pieces from the generic Makefile so that $ make arch/x86/events/amd/.s can work too. Otherwise you get: $ make arch/x86/events/amd/ibs.s scripts/Makefile.build:44: arch/x86/events/amd/Makefile: No such file or directory make[1]: *** No rule to make target 'arch/x86/events/amd/Makefile'. Stop. Makefile:1636: recipe for target 'arch/x86/events/amd/ibs.s' failed make: *** [arch/x86/events/amd/ibs.s] Error 2 Signed-off-by: Borislav Petkov Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/20170126080819.417-1-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 13 +++---------- arch/x86/events/amd/Makefile | 7 +++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 1d392c3..b8ccdb5 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -1,11 +1,4 @@ -obj-y += core.o - -obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o amd/uncore.o -obj-$(CONFIG_PERF_EVENTS_AMD_POWER) += amd/power.o -obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o msr.o -ifdef CONFIG_AMD_IOMMU -obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o -endif - -obj-$(CONFIG_CPU_SUP_INTEL) += msr.o +obj-y += core.o +obj-y += amd/ +obj-$(CONFIG_X86_LOCAL_APIC) += msr.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/ diff --git a/arch/x86/events/amd/Makefile b/arch/x86/events/amd/Makefile new file mode 100644 index 0000000..b1da46f --- /dev/null +++ b/arch/x86/events/amd/Makefile @@ -0,0 +1,7 @@ +obj-$(CONFIG_CPU_SUP_AMD) += core.o uncore.o +obj-$(CONFIG_PERF_EVENTS_AMD_POWER) += power.o +obj-$(CONFIG_X86_LOCAL_APIC) += ibs.o +ifdef CONFIG_AMD_IOMMU +obj-$(CONFIG_CPU_SUP_AMD) += iommu.o +endif +