Messages in this thread Patch in this message | | | From | Borislav Petkov <> | Subject | [PATCH 2/5] x86/events: Move perf_event_amd.c | Date | Mon, 8 Feb 2016 17:09:05 +0100 |
| |
From: Borislav Petkov <bp@suse.de>
We distribute those in vendor subdirs, starting with .../events/amd/.
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 58610539b048..51b16583679c 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 8cbc41b63447..2ba0e37acb2d 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
| |