From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422807AbcBQM0N (ORCPT ); Wed, 17 Feb 2016 07:26:13 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56658 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161459AbcBQM0H (ORCPT ); Wed, 17 Feb 2016 07:26:07 -0500 Date: Wed, 17 Feb 2016 04:23:23 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: jolsa@redhat.com, a.p.zijlstra@chello.nl, bp@suse.de, linux-kernel@vger.kernel.org, eranian@google.com, mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, vincent.weaver@maine.edu, torvalds@linux-foundation.org, peterz@infradead.org Reply-To: jolsa@redhat.com, linux-kernel@vger.kernel.org, bp@suse.de, a.p.zijlstra@chello.nl, eranian@google.com, mingo@kernel.org, tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, torvalds@linux-foundation.org, vincent.weaver@maine.edu, peterz@infradead.org In-Reply-To: <1455098123-11740-17-git-send-email-bp@alien8.de> References: <1455098123-11740-17-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_msr.c .............. => x86/events/msr.c Git-Commit-ID: 65a27a3510c82f16e673548b4c819462fabb12ae 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: 65a27a3510c82f16e673548b4c819462fabb12ae Gitweb: http://git.kernel.org/tip/65a27a3510c82f16e673548b4c819462fabb12ae Author: Borislav Petkov AuthorDate: Wed, 10 Feb 2016 10:55:22 +0100 Committer: Ingo Molnar CommitDate: Wed, 17 Feb 2016 10:11:36 +0100 perf/x86: Move perf_event_msr.c .............. => x86/events/msr.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-17-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 4 ++-- arch/x86/{kernel/cpu/perf_event_msr.c => events/msr.c} | 0 arch/x86/kernel/cpu/Makefile | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index b4e80d02..fdfea15 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -1,13 +1,13 @@ obj-y += core.o obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o amd/uncore.o -obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o +obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o msr.o ifdef CONFIG_AMD_IOMMU 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/p6.o intel/pt.o -obj-$(CONFIG_CPU_SUP_INTEL) += intel/rapl.o +obj-$(CONFIG_CPU_SUP_INTEL) += intel/rapl.o msr.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_msr.c b/arch/x86/events/msr.c similarity index 100% rename from arch/x86/kernel/cpu/perf_event_msr.c rename to arch/x86/events/msr.c diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 5cc09fc..7a60424 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -30,12 +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 -ifdef CONFIG_PERF_EVENTS -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o -obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o -endif - - obj-$(CONFIG_X86_MCE) += mcheck/ obj-$(CONFIG_MTRR) += mtrr/ obj-$(CONFIG_MICROCODE) += microcode/