summaryrefslogtreecommitdiff
path: root/arch/x86/events/intel/rapl.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-02-10 12:55:23 +0300
committerIngo Molnar <mingo@kernel.org>2016-02-17 12:11:36 +0300
commit27f6d22b037b2be6685e0e27cce929779d634119 (patch)
tree4bd811670d98a069915f528958ce42507d3bab6b /arch/x86/events/intel/rapl.c
parent65a27a3510c82f16e673548b4c819462fabb12ae (diff)
downloadlinux-27f6d22b037b2be6685e0e27cce929779d634119.tar.xz
perf/x86: Move perf_event.h to its new home
Now that all functionality has been moved to arch/x86/events/, move the perf_event.h header and adjust include paths. 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-18-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/intel/rapl.c')
-rw-r--r--arch/x86/events/intel/rapl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 9541f50a534a..580f504ec27c 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -48,7 +48,7 @@
#include <linux/slab.h>
#include <linux/perf_event.h>
#include <asm/cpu_device_id.h>
-#include "../../kernel/cpu/perf_event.h"
+#include "../perf_event.h"
/*
* RAPL energy status counters