lkml.org 
[lkml]   [2016]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch]
    Commit-ID:  fd1c601c25785ef38d698ff0091b5fe253074715
    Gitweb: http://git.kernel.org/tip/fd1c601c25785ef38d698ff0091b5fe253074715
    Author: Borislav Petkov <bp@suse.de>
    AuthorDate: Wed, 10 Feb 2016 10:55:13 +0100
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Wed, 17 Feb 2016 10:09:47 +0100

    perf/x86: Move perf_event_intel_pt.[ch] ...... => x86/events/intel/pt.[ch]

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    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>
    Link: http://lkml.kernel.org/r/1455098123-11740-8-git-send-email-bp@alien8.de
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/events/Makefile | 1 +
    arch/x86/{kernel/cpu/perf_event_intel_pt.c => events/intel/pt.c} | 4 ++--
    arch/x86/{kernel/cpu/intel_pt.h => events/intel/pt.h} | 0
    arch/x86/kernel/cpu/Makefile | 1 -
    4 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile
    index 48097fd..2a2f55d 100644
    --- a/arch/x86/events/Makefile
    +++ b/arch/x86/events/Makefile
    @@ -7,3 +7,4 @@ 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/lbr.o
    +obj-$(CONFIG_CPU_SUP_INTEL) += intel/pt.o
    diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/events/intel/pt.c
    similarity index 99%
    rename from arch/x86/kernel/cpu/perf_event_intel_pt.c
    rename to arch/x86/events/intel/pt.c
    index c0bbd10..e56cebe 100644
    --- a/arch/x86/kernel/cpu/perf_event_intel_pt.c
    +++ b/arch/x86/events/intel/pt.c
    @@ -29,8 +29,8 @@
    #include <asm/io.h>
    #include <asm/intel_pt.h>

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

    static DEFINE_PER_CPU(struct pt, pt_ctx);

    diff --git a/arch/x86/kernel/cpu/intel_pt.h b/arch/x86/events/intel/pt.h
    similarity index 100%
    rename from arch/x86/kernel/cpu/intel_pt.h
    rename to arch/x86/events/intel/pt.h
    diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
    index d52ed9b..595e3ff 100644
    --- a/arch/x86/kernel/cpu/Makefile
    +++ b/arch/x86/kernel/cpu/Makefile
    @@ -33,7 +33,6 @@ obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
    ifdef CONFIG_PERF_EVENTS
    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_rapl.o
    -obj-$(CONFIG_CPU_SUP_INTEL) += perf_event_intel_pt.o

    obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += perf_event_intel_uncore.o \
    perf_event_intel_uncore_snb.o \
    \
     
     \ /
      Last update: 2016-02-17 13:41    [W:4.198 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site