From: Borislav Petkov <bp@alien8.de>
To: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>, X86 ML <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/5] x86/events: Move perf_event_amd.c
Date: Mon, 8 Feb 2016 17:09:05 +0100 [thread overview]
Message-ID: <1454947748-28629-3-git-send-email-bp@alien8.de> (raw)
In-Reply-To: <1454947748-28629-1-git-send-email-bp@alien8.de>
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
next prev parent reply other threads:[~2016-02-08 16:10 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 16:09 [PATCH 0/5] perf: Sanitize perf directory structure, p1 Borislav Petkov
2016-02-08 16:09 ` [PATCH 1/5] x86/events: Move perf_event.c Borislav Petkov
2016-02-09 12:17 ` [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c tip-bot for Borislav Petkov
2016-02-09 13:55 ` Vince Weaver
2016-02-09 14:00 ` Thomas Gleixner
2016-02-09 14:05 ` Ingo Molnar
2016-02-09 14:11 ` Borislav Petkov
2016-02-12 22:12 ` {SPAM?} " Vince Weaver
2016-02-08 16:09 ` Borislav Petkov [this message]
2016-02-09 12:17 ` [tip:perf/core] perf/x86: Move perf_event_amd.c ........... => x86/events/amd/core.c tip-bot for Borislav Petkov
2016-02-08 16:09 ` [PATCH 3/5] x86/events: Move perf_event_amd_ibs.c Borislav Petkov
2016-02-09 12:17 ` [tip:perf/core] perf/x86: Move perf_event_amd_ibs.c ....... => x86/events/amd/ibs.c tip-bot for Borislav Petkov
2016-02-08 16:09 ` [PATCH 4/5] x86/events: Move perf_event_amd_iommu.* Borislav Petkov
2016-02-09 12:18 ` [tip:perf/core] perf/x86: Move perf_event_amd_iommu.[ch] .. => x86/events/amd/iommu.[ch] tip-bot for Borislav Petkov
2016-02-08 16:09 ` [PATCH 5/5] x86/events: Move perf_event_amd_uncore.c Borislav Petkov
2016-02-09 12:18 ` [tip:perf/core] perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.c tip-bot for Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454947748-28629-3-git-send-email-bp@alien8.de \
--to=bp@alien8.de \
--cc=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).