From: tip-bot for Borislav Petkov <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: bp@suse.de, peterz@infradead.org, linux-kernel@vger.kernel.org,
vincent.weaver@maine.edu, torvalds@linux-foundation.org,
jolsa@redhat.com, a.p.zijlstra@chello.nl, acme@redhat.com,
mingo@kernel.org, eranian@google.com, tglx@linutronix.de,
hpa@zytor.com
Subject: [tip:perf/core] perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.c
Date: Wed, 17 Feb 2016 04:19:52 -0800 [thread overview]
Message-ID: <tip-609d809f832ddda20f03029c865dd052596ea394@git.kernel.org> (raw)
In-Reply-To: <1455098123-11740-9-git-send-email-bp@alien8.de>
Commit-ID: 609d809f832ddda20f03029c865dd052596ea394
Gitweb: http://git.kernel.org/tip/609d809f832ddda20f03029c865dd052596ea394
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Wed, 10 Feb 2016 10:55:14 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 17 Feb 2016 10:09:47 +0100
perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.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/1455098123-11740-9-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/events/Makefile | 2 +-
arch/x86/{kernel/cpu/perf_event_intel_rapl.c => events/intel/rapl.c} | 2 +-
arch/x86/kernel/cpu/Makefile | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
index 2a2f55d..f68232c 100644
--- a/arch/x86/events/Makefile
+++ b/arch/x86/events/Makefile
@@ -7,4 +7,4 @@ obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o
endif
obj-$(CONFIG_CPU_SUP_INTEL) += intel/core.o intel/bts.o intel/cqm.o
obj-$(CONFIG_CPU_SUP_INTEL) += intel/cstate.o intel/ds.o intel/lbr.o
-obj-$(CONFIG_CPU_SUP_INTEL) += intel/pt.o
+obj-$(CONFIG_CPU_SUP_INTEL) += intel/pt.o intel/rapl.o
diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/events/intel/rapl.c
similarity index 99%
rename from arch/x86/kernel/cpu/perf_event_intel_rapl.c
rename to arch/x86/events/intel/rapl.c
index 24a351a..9541f50 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -48,7 +48,7 @@
#include <linux/slab.h>
#include <linux/perf_event.h>
#include <asm/cpu_device_id.h>
-#include "perf_event.h"
+#include "../../kernel/cpu/perf_event.h"
/*
* RAPL energy status counters
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 595e3ff..018451a 100644
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -32,7 +32,6 @@ obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
ifdef CONFIG_PERF_EVENTS
obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o perf_event_knc.o perf_event_p4.o
-obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o
obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore.o \
perf_event_intel_uncore_snb.o \
next prev parent reply other threads:[~2016-02-17 12:21 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 9:55 [PATCH 00/17] perf: Sanitize perf directory structure, p2 Borislav Petkov
2016-02-10 9:55 ` [PATCH 01/17] perf/x86: Move perf_event_intel_bts.c ..... => x86/events/intel/bts.c Borislav Petkov
2016-02-17 12:16 ` [tip:perf/core] perf/x86: Move perf_event_intel_bts.c ........ " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 02/17] perf/x86: Move perf_event_intel.c ......... => x86/events/intel/core.c Borislav Petkov
2016-02-17 12:17 ` [tip:perf/core] perf/x86: Move perf_event_intel.c ............ " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 03/17] perf/x86: Move perf_event_intel_cqm.c ..... => x86/events/intel/cqm.c Borislav Petkov
2016-02-17 12:17 ` [tip:perf/core] perf/x86: Move perf_event_intel_cqm.c ........ " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 04/17] perf/x86: Move perf_event_intel_cstate.c .. => x86/events/intel/cstate.c Borislav Petkov
2016-02-17 12:18 ` [tip:perf/core] perf/x86: Move perf_event_intel_cstate.c ..... " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 05/17] perf/x86: Move perf_event_intel_ds.c ...... => x86/events/intel/ds.c Borislav Petkov
2016-02-17 12:18 ` [tip:perf/core] perf/x86: Move perf_event_intel_ds.c ......... " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 06/17] perf/x86: Move perf_event_intel_lbr.c ..... => x86/events/intel/lbr.c Borislav Petkov
2016-02-17 12:18 ` [tip:perf/core] perf/x86: Move perf_event_intel_lbr.c ........ " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 07/17] perf/x86: Move perf_event_intel_pt.[ch] ... => x86/events/intel/pt.[ch] Borislav Petkov
2016-02-17 12:19 ` [tip:perf/core] perf/x86: Move perf_event_intel_pt.[ch] ...... " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 08/17] perf/x86: Move perf_event_intel_rapl.c .... => x86/events/intel/rapl.c Borislav Petkov
2016-02-17 12:19 ` tip-bot for Borislav Petkov [this message]
2016-02-10 9:55 ` [PATCH 09/17] perf/x86: Move perf_event_intel_uncore.[ch] => x86/events/intel/uncore.[ch] Borislav Petkov
2016-02-17 12:20 ` [tip:perf/core] perf/x86: Move perf_event_intel_uncore.[ch] .. " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 10/17] perf/x86: Move perf_event_intel_uncore_nhmex.c => x86/events/intel/uncore_nmhex.c Borislav Petkov
2016-02-17 12:20 ` [tip:perf/core] " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 11/17] perf/x86: Move perf_event_intel_uncore_snb.c => x86/events/intel/uncore_snb.c Borislav Petkov
2016-02-17 12:21 ` [tip:perf/core] " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 12/17] perf/x86: Move perf_event_intel_uncore_snbep.c => x86/events/intel/uncore_snbep.c Borislav Petkov
2016-02-17 12:21 ` [tip:perf/core] " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 13/17] perf/x86: Move perf_event_knc.c ........... => x86/events/intel/knc.c Borislav Petkov
2016-02-17 12:22 ` [tip:perf/core] perf/x86: Move perf_event_knc.c .............. " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 14/17] perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c Borislav Petkov
2016-02-17 12:22 ` [tip:perf/core] perf/x86: Move perf_event_p4.c ............... " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 15/17] perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c Borislav Petkov
2016-02-17 12:23 ` [tip:perf/core] perf/x86: Move perf_event_p6.c ............... " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 16/17] perf/x86: Move perf_event_msr.c ........... => x86/events/msr.c Borislav Petkov
2016-02-17 12:23 ` [tip:perf/core] perf/x86: Move perf_event_msr.c .............. " tip-bot for Borislav Petkov
2016-02-10 9:55 ` [PATCH 17/17] perf/x86: Move perf_event.h to its new home Borislav Petkov
2016-02-17 12:23 ` [tip:perf/core] " 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-609d809f832ddda20f03029c865dd052596ea394@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).