From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: jolsa@redhat.com, linux-kernel@vger.kernel.org,
a.p.zijlstra@chello.nl, bp@suse.de, acme@redhat.com,
torvalds@linux-foundation.org, eranian@google.com,
mingo@kernel.org, peterz@infradead.org, hpa@zytor.com,
tglx@linutronix.de, vincent.weaver@maine.edu
Subject: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c
Date: Tue, 9 Feb 2016 04:17:01 -0800 [thread overview]
Message-ID: <tip-fa9cbf320e996eaa3d219344b6f7013b096cafd9@git.kernel.org> (raw)
In-Reply-To: <1454947748-28629-2-git-send-email-bp@alien8.de>
Commit-ID: fa9cbf320e996eaa3d219344b6f7013b096cafd9
Gitweb: http://git.kernel.org/tip/fa9cbf320e996eaa3d219344b6f7013b096cafd9
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 8 Feb 2016 17:09:04 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 9 Feb 2016 10:23:49 +0100
perf/x86: Move perf_event.c ............... => x86/events/core.c
Also, keep the churn at minimum by adjusting the include "perf_event.h"
when each file gets moved.
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: http://lkml.kernel.org/r/1454947748-28629-2-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/Kbuild | 3 ++-
arch/x86/events/Makefile | 1 +
arch/x86/{kernel/cpu/perf_event.c => events/core.c} | 2 +-
arch/x86/kernel/cpu/Makefile | 2 --
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild
index 1538562..eb3abf8 100644
--- a/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
@@ -1,6 +1,7 @@
-
obj-y += entry/
+obj-$(CONFIG_PERF_EVENTS) += events/
+
obj-$(CONFIG_KVM) += kvm/
# Xen paravirtualization support
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
new file mode 100644
index 0000000..3fad3ce
--- /dev/null
+++ b/arch/x86/events/Makefile
@@ -0,0 +1 @@
+obj-y += core.o
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/events/core.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event.c
rename to arch/x86/events/core.c
index 7402c818..90ca601 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/events/core.c
@@ -37,7 +37,7 @@
#include <asm/desc.h>
#include <asm/ldt.h>
-#include "perf_event.h"
+#include "../kernel/cpu/perf_event.h"
struct x86_pmu x86_pmu __read_mostly;
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 5803130..77000d5 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -30,8 +30,6 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o
obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o
obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
-obj-$(CONFIG_PERF_EVENTS) += perf_event.o
-
ifdef CONFIG_PERF_EVENTS
obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd.o perf_event_amd_uncore.o
ifdef CONFIG_AMD_IOMMU
next prev parent reply other threads:[~2016-02-09 12:17 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-bot for Borislav Petkov [this message]
2016-02-09 13:55 ` [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c 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 ` [PATCH 2/5] x86/events: Move perf_event_amd.c Borislav Petkov
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=tip-fa9cbf320e996eaa3d219344b6f7013b096cafd9@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=bp@suse.de \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=vincent.weaver@maine.edu \
/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).