From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161602AbcBQMUJ (ORCPT ); Wed, 17 Feb 2016 07:20:09 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56352 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161429AbcBQMUC (ORCPT ); Wed, 17 Feb 2016 07:20:02 -0500 Date: Wed, 17 Feb 2016 04:17:12 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org, bp@suse.de, tglx@linutronix.de, acme@redhat.com, jolsa@redhat.com, mingo@kernel.org, vincent.weaver@maine.edu, eranian@google.com, torvalds@linux-foundation.org Reply-To: acme@redhat.com, eranian@google.com, torvalds@linux-foundation.org, jolsa@redhat.com, vincent.weaver@maine.edu, mingo@kernel.org, hpa@zytor.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, bp@suse.de, tglx@linutronix.de, peterz@infradead.org In-Reply-To: <1455098123-11740-3-git-send-email-bp@alien8.de> References: <1455098123-11740-3-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.c Git-Commit-ID: e1069839dd6893d2135b2fc4d96e5d03d73c2c3d 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: e1069839dd6893d2135b2fc4d96e5d03d73c2c3d Gitweb: http://git.kernel.org/tip/e1069839dd6893d2135b2fc4d96e5d03d73c2c3d Author: Borislav Petkov AuthorDate: Wed, 10 Feb 2016 10:55:08 +0100 Committer: Ingo Molnar CommitDate: Wed, 17 Feb 2016 10:09:45 +0100 perf/x86: Move perf_event_intel.c ............ => x86/events/intel/core.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-3-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 2 +- arch/x86/{kernel/cpu/perf_event_intel.c => events/intel/core.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index bcd1e21..834e9ae 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -5,4 +5,4 @@ obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o ifdef CONFIG_AMD_IOMMU obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o endif -obj-$(CONFIG_CPU_SUP_INTEL) += intel/bts.o +obj-$(CONFIG_CPU_SUP_INTEL) += intel/core.o intel/bts.o diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/events/intel/core.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_intel.c rename to arch/x86/events/intel/core.c index fed2ab1..1edf301 100644 --- a/arch/x86/kernel/cpu/perf_event_intel.c +++ b/arch/x86/events/intel/core.c @@ -18,7 +18,7 @@ #include #include -#include "perf_event.h" +#include "../../kernel/cpu/perf_event.h" /* * Intel PerfMon, used on Core and later. diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index e28f931..0a27243 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -32,7 +32,7 @@ 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_lbr.o perf_event_intel_ds.o perf_event_intel.o +obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_lbr.o perf_event_intel_ds.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_rapl.o perf_event_intel_cqm.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_cstate.o