From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756709AbcBIMSU (ORCPT ); Tue, 9 Feb 2016 07:18:20 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35952 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753409AbcBIMSR (ORCPT ); Tue, 9 Feb 2016 07:18:17 -0500 Date: Tue, 9 Feb 2016 04:17:28 -0800 From: tip-bot for Borislav Petkov Message-ID: Cc: eranian@google.com, bp@suse.de, acme@redhat.com, tglx@linutronix.de, jolsa@redhat.com, torvalds@linux-foundation.org, mingo@kernel.org, peterz@infradead.org, vincent.weaver@maine.edu, hpa@zytor.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org Reply-To: peterz@infradead.org, mingo@kernel.org, torvalds@linux-foundation.org, jolsa@redhat.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, hpa@zytor.com, vincent.weaver@maine.edu, acme@redhat.com, bp@suse.de, eranian@google.com, tglx@linutronix.de In-Reply-To: <1454947748-28629-3-git-send-email-bp@alien8.de> References: <1454947748-28629-3-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/x86: Move perf_event_amd.c ........... => x86/events/amd/core.c Git-Commit-ID: 39b0332a215832ce3a8f8f57344da4a64370e3ca 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: 39b0332a215832ce3a8f8f57344da4a64370e3ca Gitweb: http://git.kernel.org/tip/39b0332a215832ce3a8f8f57344da4a64370e3ca Author: Borislav Petkov AuthorDate: Mon, 8 Feb 2016 17:09:05 +0100 Committer: Ingo Molnar CommitDate: Tue, 9 Feb 2016 10:23:49 +0100 perf/x86: Move perf_event_amd.c ........... => x86/events/amd/core.c We distribute those in vendor subdirs, starting with .../events/amd/. 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-3-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/events/Makefile | 2 ++ arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 3fad3ce..e0560b6 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -1 +1,3 @@ obj-y += core.o + +obj-$(CONFIG_CPU_SUP_AMD) += amd/core.o diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/events/amd/core.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_amd.c rename to arch/x86/events/amd/core.c index 5861053..51b1658 100644 --- a/arch/x86/kernel/cpu/perf_event_amd.c +++ b/arch/x86/events/amd/core.c @@ -5,7 +5,7 @@ #include #include -#include "perf_event.h" +#include "../../kernel/cpu/perf_event.h" static __initconst const u64 amd_hw_cache_event_ids [PERF_COUNT_HW_CACHE_MAX] diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 77000d5..d549b02 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -31,7 +31,7 @@ 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.o perf_event_amd_uncore.o +obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_uncore.o ifdef CONFIG_AMD_IOMMU obj-$(CONFIG_CPU_SUP_AMD) += perf_event_amd_iommu.o endif