From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755650AbcBHQKZ (ORCPT ); Mon, 8 Feb 2016 11:10:25 -0500 Received: from mail.skyhub.de ([78.46.96.112]:45004 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754889AbcBHQJV (ORCPT ); Mon, 8 Feb 2016 11:09:21 -0500 From: Borislav Petkov To: Ingo Molnar Cc: Peter Zijlstra , X86 ML , LKML Subject: [PATCH 2/5] x86/events: Move perf_event_amd.c Date: Mon, 8 Feb 2016 17:09:05 +0100 Message-Id: <1454947748-28629-3-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 We distribute those in vendor subdirs, starting with .../events/amd/. Signed-off-by: Borislav Petkov --- 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(-) rename arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} (99%) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 3fad3ce1bbab..e0560b6dd77b 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 58610539b048..51b16583679c 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 8cbc41b63447..2ba0e37acb2d 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 -- 2.3.5