From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756388AbbLDVS1 (ORCPT ); Fri, 4 Dec 2015 16:18:27 -0500 Received: from mail.skyhub.de ([78.46.96.112]:34571 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754973AbbLDVSE (ORCPT ); Fri, 4 Dec 2015 16:18:04 -0500 Date: Fri, 4 Dec 2015 22:17:56 +0100 From: Borislav Petkov To: Ingo Molnar , Peter Zijlstra Cc: lkml Subject: Reorganize perf kernel side Message-ID: <20151204211756.GR21177@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi guys, so I've had my eyes on this for a long time now and it has managed to get on my nerves just enough to do something about it :-) So how about moving perf stuff to arch/x86/perf/ and get rid of the prefixes in the filenames. This also flattens our folder structure which is a good thing and which we've been talking about in the past. In order to diminish churn, I can do the whole thing in 4-5 patches' sets, after having run enough *config smoke tests and 0day bot too. Anyway, something like that. perf_event__.c can then move to arch/x86/perf//type.c and have much saner structure. Thoughts? --- arch/x86/Kbuild | 2 ++ arch/x86/kernel/cpu/Makefile | 2 -- arch/x86/perf/Makefile | 1 + arch/x86/{kernel/cpu => perf}/perf_event.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 arch/x86/perf/Makefile rename arch/x86/{kernel/cpu => perf}/perf_event.c (99%) diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 1538562cc720..cd85aa30ad14 100644 --- a/arch/x86/Kbuild +++ b/arch/x86/Kbuild @@ -1,6 +1,8 @@ obj-y += entry/ +obj-$(CONFIG_PERF_EVENTS) += perf/ + obj-$(CONFIG_KVM) += kvm/ # Xen paravirtualization support diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 58031303e304..77000d54fcd1 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 diff --git a/arch/x86/perf/Makefile b/arch/x86/perf/Makefile new file mode 100644 index 000000000000..3b2566aa58e5 --- /dev/null +++ b/arch/x86/perf/Makefile @@ -0,0 +1 @@ +obj-y += perf_event.o diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/perf/perf_event.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event.c rename to arch/x86/perf/perf_event.c index 9dfbba5ce6e8..ccbf7242307c 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/perf/perf_event.c @@ -37,7 +37,7 @@ #include #include -#include "perf_event.h" +#include "../kernel/cpu/perf_event.h" struct x86_pmu x86_pmu __read_mostly; -- 2.3.5 -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply.