From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756875AbcBIMTd (ORCPT ); Tue, 9 Feb 2016 07:19:33 -0500 Received: from terminus.zytor.com ([198.137.202.10]:36004 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756804AbcBIMTa (ORCPT ); Tue, 9 Feb 2016 07:19:30 -0500 Date: Tue, 9 Feb 2016 04:18:44 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: acme@redhat.com, eranian@google.com, torvalds@linux-foundation.org, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, vincent.weaver@maine.edu, a.p.zijlstra@chello.nl, bp@suse.de, jolsa@redhat.com, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: a.p.zijlstra@chello.nl, bp@suse.de, jolsa@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, eranian@google.com, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de, vincent.weaver@maine.edu In-Reply-To: <1454947748-28629-6-git-send-email-bp@alien8.de> References: <1454947748-28629-6-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.c Git-Commit-ID: d0af1c0525d561fe3ab6d7a767cdd52704da25cd 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: d0af1c0525d561fe3ab6d7a767cdd52704da25cd Gitweb: http://git.kernel.org/tip/d0af1c0525d561fe3ab6d7a767cdd52704da25cd Author: Borislav Petkov AuthorDate: Mon, 8 Feb 2016 17:09:08 +0100 Committer: Ingo Molnar CommitDate: Tue, 9 Feb 2016 10:23:50 +0100 perf/x86: Move perf_event_amd_uncore.c .... => x86/events/amd/uncore.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/1454947748-28629-6-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 2 +- arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} | 0 arch/x86/kernel/cpu/Makefile | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 838195d..7d1ecff 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -1,6 +1,6 @@ obj-y += core.o -obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o +obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o amd/uncore.o obj-$(CONFIG_X86_LOCAL_APIC) += amd/ibs.o ifdef CONFIG_AMD_IOMMU obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o diff --git a/arch/x86/kernel/cpu/perf_event_amd_uncore.c b/arch/x86/events/amd/uncore.c similarity index 100% rename from arch/x86/kernel/cpu/perf_event_amd_uncore.c rename to arch/x86/events/amd/uncore.c diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 2e15d9d..7edbeb9 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -31,7 +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_AMD) += perf_event_amd_uncore.o 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_rapl.o perf_event_intel_cqm.o