From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755701AbcBHQKs (ORCPT ); Mon, 8 Feb 2016 11:10:48 -0500 Received: from mail.skyhub.de ([78.46.96.112]:45001 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754885AbcBHQJV (ORCPT ); Mon, 8 Feb 2016 11:09:21 -0500 From: Borislav Petkov To: Ingo Molnar Cc: Peter Zijlstra , X86 ML , LKML Subject: [PATCH 1/5] x86/events: Move perf_event.c Date: Mon, 8 Feb 2016 17:09:04 +0100 Message-Id: <1454947748-28629-2-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1454947748-28629-1-git-send-email-bp@alien8.de> References: <1454947748-28629-1-git-send-email-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov Also, keep the churn at minimum by adjusting the include "perf_event.h" when each file gets moved. Signed-off-by: Borislav Petkov --- 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(-) create mode 100644 arch/x86/events/Makefile rename arch/x86/{kernel/cpu/perf_event.c => events/core.c} (99%) diff --git a/arch/x86/Kbuild b/arch/x86/Kbuild index 1538562cc720..eb3abf8ac44e 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 000000000000..3fad3ce1bbab --- /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 7402c8182813..90ca601b5d5c 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 faa7b5204129..8cbc41b63447 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 -- 2.3.5