Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1297029
| From | Borislav Petkov <bp@alien8.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [RFC PATCH 2/5] x86/events: Move perf_event_amd.c |
| Date | 2015-12-22 21:00 +0100 |
| Message-ID | <qIBge-8do-5@gated-at.bofh.it> (permalink) |
| References | <qIBge-8do-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Borislav Petkov <bp@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/events/Makefile | 2 ++
arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} | 2 +-
arch/x86/kernel/cpu/Makefile | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
rename arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} (99%)
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 3fad3ce1bbab..e0560b6dd77b 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -1 +1,3 @@
obj-y += core.o
+
+obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o
diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/events/amd/core.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_amd.c
rename to arch/x86/events/amd/core.c
index 3ea177cb7366..53e04f58d773 100644
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/events/amd/core.c
@@ -5,7 +5,7 @@
#include <linux/slab.h>
#include <asm/apicdef.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
static __initconst const u64 amd_hw_cache_event_ids
[PERF_COUNT_HW_CACHE_MAX]
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 89d9b1f84ac3..66524a343c13 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -31,7 +31,7 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
ifdef CONFIG_PERF_EVENTS
-obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd.o perf_event_amd_uncore.o
+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
--
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
[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