lkml.org 
[lkml]   [2016]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/17] perf/x86: Move perf_event_p4.c ............ => x86/events/intel/p4.c
    Date
    From: Borislav Petkov <bp@suse.de>

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Vince Weaver <vincent.weaver@maine.edu>
    ---
    arch/x86/events/Makefile | 3 ++-
    arch/x86/{kernel/cpu/perf_event_p4.c => events/intel/p4.c} | 2 +-
    arch/x86/kernel/cpu/Makefile | 2 +-
    3 files changed, 4 insertions(+), 3 deletions(-)
    rename arch/x86/{kernel/cpu/perf_event_p4.c => events/intel/p4.c} (99%)

    diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
    index c1647a65bf1c..5a6f20d3f3ea 100644
    --- a/arch/x86/events/Makefile
    +++ b/arch/x86/events/Makefile
    @@ -7,6 +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/pt.o intel/rapl.o
    +obj-$(CONFIG_CPU_SUP_INTEL) += intel/lbr.o intel/p4.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_p4.c b/arch/x86/events/intel/p4.c
    similarity index 99%
    rename from arch/x86/kernel/cpu/perf_event_p4.c
    rename to arch/x86/events/intel/p4.c
    index f2e56783af3d..1c72fedd96d3 100644
    --- a/arch/x86/kernel/cpu/perf_event_p4.c
    +++ b/arch/x86/events/intel/p4.c
    @@ -13,7 +13,7 @@
    #include <asm/hardirq.h>
    #include <asm/apic.h>

    -#include "perf_event.h"
    +#include "../../kernel/cpu/perf_event.h"

    #define P4_CNTR_LIMIT 3
    /*
    diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
    index 75e017f0dcfd..4290f1083885 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_INTEL) += perf_event_p6.o perf_event_p4.o
    +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
    --
    2.3.5
    \
     
     \ /
      Last update: 2016-02-10 11:21    [W:4.216 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site