From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422727AbcBQMVX (ORCPT ); Wed, 17 Feb 2016 07:21:23 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56412 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161498AbcBQMVR (ORCPT ); Wed, 17 Feb 2016 07:21:17 -0500 Date: Wed, 17 Feb 2016 04:19:52 -0800 From: tip-bot for Borislav Petkov Message-ID: 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 Reply-To: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, eranian@google.com, jolsa@redhat.com, vincent.weaver@maine.edu, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl, peterz@infradead.org, bp@suse.de In-Reply-To: <1455098123-11740-9-git-send-email-bp@alien8.de> References: <1455098123-11740-9-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_intel_rapl.c ....... => x86/events/intel/rapl.c Git-Commit-ID: 609d809f832ddda20f03029c865dd052596ea394 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 609d809f832ddda20f03029c865dd052596ea394 Gitweb: http://git.kernel.org/tip/609d809f832ddda20f03029c865dd052596ea394 Author: Borislav Petkov AuthorDate: Wed, 10 Feb 2016 10:55:14 +0100 Committer: Ingo Molnar 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 Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/1455098123-11740-9-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- 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 #include #include -#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 \