From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756839AbcBIMT1 (ORCPT ); Tue, 9 Feb 2016 07:19:27 -0500 Received: from terminus.zytor.com ([198.137.202.10]:36000 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756804AbcBIMTY (ORCPT ); Tue, 9 Feb 2016 07:19:24 -0500 Date: Tue, 9 Feb 2016 04:18:23 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: hpa@zytor.com, vincent.weaver@maine.edu, a.p.zijlstra@chello.nl, torvalds@linux-foundation.org, eranian@google.com, peterz@infradead.org, linux-kernel@vger.kernel.org, acme@redhat.com, joro@8bytes.org, bp@suse.de, tglx@linutronix.de, mingo@kernel.org, jolsa@redhat.com Reply-To: hpa@zytor.com, torvalds@linux-foundation.org, a.p.zijlstra@chello.nl, vincent.weaver@maine.edu, acme@redhat.com, joro@8bytes.org, linux-kernel@vger.kernel.org, eranian@google.com, peterz@infradead.org, jolsa@redhat.com, tglx@linutronix.de, mingo@kernel.org, bp@suse.de In-Reply-To: <1454947748-28629-5-git-send-email-bp@alien8.de> References: <1454947748-28629-5-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_amd_iommu.[ch] .. => x86/events/amd/iommu.[ch] Git-Commit-ID: 5b26547dd7faa84e1293baa144a0f3e74ed7d4c7 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: 5b26547dd7faa84e1293baa144a0f3e74ed7d4c7 Gitweb: http://git.kernel.org/tip/5b26547dd7faa84e1293baa144a0f3e74ed7d4c7 Author: Borislav Petkov AuthorDate: Mon, 8 Feb 2016 17:09:07 +0100 Committer: Ingo Molnar CommitDate: Tue, 9 Feb 2016 10:23:50 +0100 perf/x86: Move perf_event_amd_iommu.[ch] .. => x86/events/amd/iommu.[ch] Signed-off-by: Borislav Petkov Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Joerg Roedel Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1454947748-28629-5-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 3 +++ arch/x86/{kernel/cpu/perf_event_amd_iommu.c => events/amd/iommu.c} | 4 ++-- arch/x86/{kernel/cpu/perf_event_amd_iommu.h => events/amd/iommu.h} | 0 arch/x86/kernel/cpu/Makefile | 3 --- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 88f7873..838195d 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -2,3 +2,6 @@ obj-y += core.o obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o +ifdef CONFIG_AMD_IOMMU +obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o +endif diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/events/amd/iommu.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_amd_iommu.c rename to arch/x86/events/amd/iommu.c index 97242a9..629bc70 100644 --- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -16,8 +16,8 @@ #include #include -#include "perf_event.h" -#include "perf_event_amd_iommu.h" +#include "../../kernel/cpu/perf_event.h" +#include "iommu.h" #define COUNTER_SHIFT 16 diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.h b/arch/x86/events/amd/iommu.h similarity index 100% rename from arch/x86/kernel/cpu/perf_event_amd_iommu.h rename to arch/x86/events/amd/iommu.h diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index dddba22..2e15d9d 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -32,9 +32,6 @@ obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o ifdef CONFIG_PERF_EVENTS obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_uncore.o -ifdef CONFIG_AMD_IOMMU -obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_iommu.o -endif obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o perf_event_intel_cqm.o