From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757607AbcBJJ6Q (ORCPT ); Wed, 10 Feb 2016 04:58:16 -0500 Received: from mail.skyhub.de ([78.46.96.112]:59364 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752674AbcBJJzc (ORCPT ); Wed, 10 Feb 2016 04:55:32 -0500 From: Borislav Petkov To: Ingo Molnar Cc: X86 ML , LKML Subject: [PATCH 15/17] perf/x86: Move perf_event_p6.c ............ => x86/events/intel/p6.c Date: Wed, 10 Feb 2016 10:55:21 +0100 Message-Id: <1455098123-11740-16-git-send-email-bp@alien8.de> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1455098123-11740-1-git-send-email-bp@alien8.de> References: <1455098123-11740-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 Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Ingo Molnar Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver --- arch/x86/events/Makefile | 2 +- arch/x86/{kernel/cpu/perf_event_p6.c => events/intel/p6.c} | 2 +- arch/x86/kernel/cpu/Makefile | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) rename arch/x86/{kernel/cpu/perf_event_p6.c => events/intel/p6.c} (99%) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 5a6f20d3f3ea..b4e80d02a78a 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -7,7 +7,7 @@ obj-$(CONFIG_CPU_SUP_AMD) += amd/iommu.o endif obj-$(CONFIG_CPU_SUP_INTEL) += intel/core.o intel/bts.o intel/cqm.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/cstate.o intel/ds.o intel/knc.o -obj-$(CONFIG_CPU_SUP_INTEL) += intel/lbr.o intel/p4.o intel/pt.o +obj-$(CONFIG_CPU_SUP_INTEL) += intel/lbr.o intel/p4.o intel/p6.o intel/pt.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/rapl.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore.o intel/uncore_nhmex.o obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel/uncore_snb.o intel/uncore_snbep.o diff --git a/arch/x86/kernel/cpu/perf_event_p6.c b/arch/x86/events/intel/p6.c similarity index 99% rename from arch/x86/kernel/cpu/perf_event_p6.c rename to arch/x86/events/intel/p6.c index 7c1a0c07b607..ee5c4e8bd556 100644 --- a/arch/x86/kernel/cpu/perf_event_p6.c +++ b/arch/x86/events/intel/p6.c @@ -1,7 +1,7 @@ #include #include -#include "perf_event.h" +#include "../../kernel/cpu/perf_event.h" /* * Not sure about some of these diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile index 4290f1083885..662cab77ade9 100644 --- a/arch/x86/kernel/cpu/Makefile +++ b/arch/x86/kernel/cpu/Makefile @@ -31,8 +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_INTEL) += perf_event_p6.o - obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_msr.o obj-$(CONFIG_CPU_SUP_AMD) += perf_event_msr.o endif -- 2.3.5