From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756533AbcBIMR4 (ORCPT ); Tue, 9 Feb 2016 07:17:56 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35935 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753446AbcBIMRx (ORCPT ); Tue, 9 Feb 2016 07:17:53 -0500 Date: Tue, 9 Feb 2016 04:17:01 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: jolsa@redhat.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, bp@suse.de, acme@redhat.com, torvalds@linux-foundation.org, eranian@google.com, mingo@kernel.org, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, vincent.weaver@maine.edu Reply-To: jolsa@redhat.com, linux-kernel@vger.kernel.org, bp@suse.de, a.p.zijlstra@chello.nl, acme@redhat.com, torvalds@linux-foundation.org, eranian@google.com, peterz@infradead.org, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, vincent.weaver@maine.edu In-Reply-To: <1454947748-28629-2-git-send-email-bp@alien8.de> References: <1454947748-28629-2-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event.c ............... => x86/events/core.c Git-Commit-ID: fa9cbf320e996eaa3d219344b6f7013b096cafd9 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: fa9cbf320e996eaa3d219344b6f7013b096cafd9 Gitweb: http://git.kernel.org/tip/fa9cbf320e996eaa3d219344b6f7013b096cafd9 Author: Borislav Petkov AuthorDate: Mon, 8 Feb 2016 17:09:04 +0100 Committer: Ingo Molnar CommitDate: Tue, 9 Feb 2016 10:23:49 +0100 perf/x86: Move perf_event.c ............... => x86/events/core.c Also, keep the churn at minimum by adjusting the include "perf_event.h" when each file gets moved. 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/1454947748-28629-2-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/Kbuild | 3 ++- arch/x86/events/Makefile | 1 + arch/x86/{kernel/cpu/perf_event.c => events/core.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 -- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 1538562..eb3abf8 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -1,6 +1,7 @@ - obj-y += entry/ +obj-$(CONFIG_PERF_EVENTS) += events/ + obj-$(CONFIG_KVM) += kvm/ # Xen paravirtualization support diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile new file mode 100644 index 0000000..3fad3ce --- /dev/null +++ b/arch/x86/events/Makefile @@ -0,0 +1 @@ +obj-y += core.o diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/events/core.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event.c rename to arch/x86/events/core.c index 7402c818..90ca601 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/events/core.c @@ -37,7 +37,7 @@ #include #include -#include "perf_event.h" +#include "../kernel/cpu/perf_event.h" struct x86_pmu x86_pmu __read_mostly; diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 5803130..77000d5 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -30,8 +30,6 @@ obj-$(CONFIG_CPU_SUP_CENTAUR) += centaur.o obj-$(CONFIG_CPU_SUP_TRANSMETA_32) += transmeta.o obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o -obj-$(CONFIG_PERF_EVENTS) += perf_event.o - ifdef CONFIG_PERF_EVENTS obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd.o perf_event_amd_uncore.o ifdef CONFIG_AMD_IOMMU