From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755599AbcBHQJ7 (ORCPT ); Mon, 8 Feb 2016 11:09:59 -0500 Received: from mail.skyhub.de ([78.46.96.112]:45007 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754922AbcBHQJV (ORCPT ); Mon, 8 Feb 2016 11:09:21 -0500 From: Borislav Petkov To: Ingo Molnar Cc: Peter Zijlstra , X86 ML , LKML Subject: [PATCH 5/5] x86/events: Move perf_event_amd_uncore.c Date: Mon, 8 Feb 2016 17:09:08 +0100 Message-Id: <1454947748-28629-6-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 Signed-off-by: Borislav Petkov --- 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(-) rename arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} (100%) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 838195d90961..7d1ecff583b0 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 37444ffd714d..d8cf3338a035 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 -- 2.3.5