From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: jolsa@redhat.com, mingo@kernel.org, eranian@google.com,
vincent.weaver@maine.edu, bp@suse.de, peterz@infradead.org,
tglx@linutronix.de, acme@redhat.com,
linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl,
torvalds@linux-foundation.org, hpa@zytor.com
Subject: [tip:perf/core] perf/x86: Move perf_event_amd_ibs.c ....... => x86/events/amd/ibs.c
Date: Tue, 9 Feb 2016 04:17:58 -0800 [thread overview]
Message-ID: <tip-218cfe4ed8885f988d67ac5f52efeff7233ae1f2@git.kernel.org> (raw)
In-Reply-To: <1454947748-28629-4-git-send-email-bp@alien8.de>
Commit-ID: 218cfe4ed8885f988d67ac5f52efeff7233ae1f2
Gitweb: http://git.kernel.org/tip/218cfe4ed8885f988d67ac5f52efeff7233ae1f2
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 8 Feb 2016 17:09:06 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 9 Feb 2016 10:23:49 +0100
perf/x86: Move perf_event_amd_ibs.c ....... => x86/events/amd/ibs.c
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-4-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/events/Makefile | 1 +
arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c} | 2 +-
arch/x86/kernel/cpu/Makefile | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index e0560b6..88f7873 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -1,3 +1,4 @@
obj-y += core.o
obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o
+obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o
diff --git a/arch/x86/kernel/cpu/perf_event_amd_ibs.c b/arch/x86/events/amd/ibs.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_amd_ibs.c
rename to arch/x86/events/amd/ibs.c
index aa12f95..a8abd08 100644
--- a/arch/x86/kernel/cpu/perf_event_amd_ibs.c
+++ b/arch/x86/events/amd/ibs.c
@@ -14,7 +14,7 @@
#include <asm/apic.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
static u32 ibs_caps;
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index d549b02..dddba22 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -54,7 +54,7 @@ obj-$(CONFIG_X86_MCE) += mcheck/
obj-$(CONFIG_MTRR) += mtrr/
obj-$(CONFIG_MICROCODE) += microcode/
-obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o perf_event_amd_ibs.o
+obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
obj-$(CONFIG_HYPERVISOR_GUEST) += vmware.o hypervisor.o mshyperv.o
next prev parent reply other threads:[~2016-02-09 12:18 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 ` [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-bot for Borislav Petkov [this message]
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-218cfe4ed8885f988d67ac5f52efeff7233ae1f2@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).