Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1297033

[RFC PATCH 4/5] x86/events: Move perf_event_amd_iommu.*

Show all headers | View raw

From: Borislav Petkov <bp@suse.de>

Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
---
 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(-)
 rename arch/x86/{kernel/cpu/perf_event_amd_iommu.c => events/amd/iommu.c} (99%)
 rename arch/x86/{kernel/cpu/perf_event_amd_iommu.h => events/amd/iommu.h} (100%)

diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 88f787350bf0..838195d90961 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 97242a9242bd..629bc700eb08 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -16,8 +16,8 @@
 #include <linux/cpumask.h>
 #include <linux/slab.h>
 
-#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 395cd5148cc1..86aa9ac6bd03 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
-- 
2.3.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFC PATCH 0/5] perf: Sanitize perf directory structure, p1 Borislav Petkov <bp@alien8.de> - 2015-12-22 21:00 +0100
  [RFC PATCH 3/5] x86/events: Move perf_event_amd_ibs.c Borislav Petkov <bp@alien8.de> - 2015-12-22 21:00 +0100
  [RFC PATCH 2/5] x86/events: Move perf_event_amd.c Borislav Petkov <bp@alien8.de> - 2015-12-22 21:00 +0100
  [RFC PATCH 4/5] x86/events: Move perf_event_amd_iommu.* Borislav Petkov <bp@alien8.de> - 2015-12-22 21:00 +0100
    Re: [RFC PATCH 4/5] x86/events: Move perf_event_amd_iommu.* Joerg Roedel <joro@8bytes.org> - 2015-12-28 17:00 +0100
      Re: [RFC PATCH 4/5] x86/events: Move perf_event_amd_iommu.* Boris Petkov <bp@alien8.de> - 2015-12-29 10:00 +0100
  [RFC PATCH 5/5] x86/events: Move perf_event_amd_uncore.c Borislav Petkov <bp@alien8.de> - 2015-12-22 21:00 +0100
  [RFC PATCH 1/5] x86/events: Move perf_event.c Borislav Petkov <bp@alien8.de> - 2015-12-22 21:00 +0100

csiph-web