Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aec1ad7 authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

perf/x86: Move perf_event_intel_cstate.c ..... => x86/events/intel/cstate.c 



Signed-off-by: default avatarBorislav 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-5-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5c781a3d

arch/x86/events/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ ifdef CONFIG_AMD_IOMMU 
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

arch/x86/kernel/cpu/perf_event_intel_cstate.c→arch/x86/events/intel/cstate.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
#include <linux/slab.h>

#include <linux/perf_event.h>

#include <asm/cpu_device_id.h>

#include "perf_event.h"

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



#define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format)		\

static ssize_t __cstate_##_var##_show(struct kobject *kobj,	\

arch/x86/kernel/cpu/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 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

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_rapl.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_pt.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_cstate.o



obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE)	+= perf_event_intel_uncore.o \

					   perf_event_intel_uncore_snb.o \