From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422938AbcBQMXy (ORCPT ); Wed, 17 Feb 2016 07:23:54 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56563 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422774AbcBQMXv (ORCPT ); Wed, 17 Feb 2016 07:23:51 -0500 Date: Wed, 17 Feb 2016 04:23:02 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: acme@redhat.com, bp@suse.de, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, torvalds@linux-foundation.org, eranian@google.com, linux-kernel@vger.kernel.org, mingo@kernel.org, vincent.weaver@maine.edu, jolsa@redhat.com Reply-To: linux-kernel@vger.kernel.org, eranian@google.com, torvalds@linux-foundation.org, jolsa@redhat.com, vincent.weaver@maine.edu, mingo@kernel.org, acme@redhat.com, bp@suse.de, a.p.zijlstra@chello.nl, tglx@linutronix.de, peterz@infradead.org, hpa@zytor.com In-Reply-To: <1455098123-11740-16-git-send-email-bp@alien8.de> References: <1455098123-11740-16-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_p6.c ............... => x86/events/intel/p6.c Git-Commit-ID: 5e865ed44b39fa991a8fb1d7d9c0338f8fedac33 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: 5e865ed44b39fa991a8fb1d7d9c0338f8fedac33 Gitweb: http://git.kernel.org/tip/5e865ed44b39fa991a8fb1d7d9c0338f8fedac33 Author: Borislav Petkov AuthorDate: Wed, 10 Feb 2016 10:55:21 +0100 Committer: Ingo Molnar CommitDate: Wed, 17 Feb 2016 10:11:36 +0100 perf/x86: Move perf_event_p6.c ............... => x86/events/intel/p6.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-16-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 2 +- arch/x86/{kernel/cpu/perf_event_p6.c => events/intel/p6.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 5a6f20d..b4e80d02 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -7,7 +7,7 @@ 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/knc.o -obj-$(CONFIG_CPU_SUP_INTEL) += intel/lbr.o intel/p4.o intel/pt.o +obj-$(CONFIG_CPU_SUP_INTEL) += intel/lbr.o intel/p4.o intel/p6.o intel/pt.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/rapl.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore.o intel/uncore_nhmex.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore_snb.o intel/uncore_snbep.o diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/events/intel/p6.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_p6.c rename to arch/x86/events/intel/p6.c index 7c1a0c0..ee5c4e8 100644 --- a/arch/x86/kernel/cpu/perf_event_p6.c +++ b/arch/x86/events/intel/p6.c @@ -1,7 +1,7 @@ #include #include -#include "perf_event.h" +#include "../../kernel/cpu/perf_event.h" /* * Not sure about some of these diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 2bb41d0..5cc09fc 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -31,8 +31,6 @@ obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o ifdef CONFIG_PERF_EVENTS -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_p6.o - obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o endif