Commit 27f6d22b authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar

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: 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-18-git-send-email-bp@alien8.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 65a27a35
......@@ -5,7 +5,7 @@
#include <linux/slab.h>
#include <asm/apicdef.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
static __initconst const u64 amd_hw_cache_event_ids
[PERF_COUNT_HW_CACHE_MAX]
......
......@@ -14,7 +14,7 @@
#include <asm/apic.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
static u32 ibs_caps;
......
......@@ -16,7 +16,7 @@
#include <linux/cpumask.h>
#include <linux/slab.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
#include "iommu.h"
#define COUNTER_SHIFT 16
......
......@@ -37,7 +37,7 @@
#include <asm/desc.h>
#include <asm/ldt.h>
#include "../kernel/cpu/perf_event.h"
#include "perf_event.h"
struct x86_pmu x86_pmu __read_mostly;
......
......@@ -26,7 +26,7 @@
#include <asm-generic/sizes.h>
#include <asm/perf_event.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
struct bts_ctx {
struct perf_output_handle handle;
......
......@@ -18,7 +18,7 @@
#include <asm/hardirq.h>
#include <asm/apic.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
/*
* Intel PerfMon, used on Core and later.
......
......@@ -7,7 +7,7 @@
#include <linux/perf_event.h>
#include <linux/slab.h>
#include <asm/cpu_device_id.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
#define MSR_IA32_PQR_ASSOC 0x0c8f
#define MSR_IA32_QM_CTR 0x0c8e
......
......@@ -89,7 +89,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"
#define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format) \
static ssize_t __cstate_##_var##_show(struct kobject *kobj, \
......
......@@ -5,7 +5,7 @@
#include <asm/perf_event.h>
#include <asm/insn.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
/* The size of a BTS record in bytes: */
#define BTS_RECORD_SIZE 24
......
......@@ -5,7 +5,7 @@
#include <asm/hardirq.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
static const u64 knc_perfmon_event_map[] =
{
......
......@@ -5,7 +5,7 @@
#include <asm/msr.h>
#include <asm/insn.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
enum {
LBR_FORMAT_32 = 0x00,
......
......@@ -13,7 +13,7 @@
#include <asm/hardirq.h>
#include <asm/apic.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
#define P4_CNTR_LIMIT 3
/*
......
#include <linux/perf_event.h>
#include <linux/types.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
/*
* Not sure about some of these
......
......@@ -29,7 +29,7 @@
#include <asm/io.h>
#include <asm/intel_pt.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
#include "pt.h"
static DEFINE_PER_CPU(struct pt, pt_ctx);
......
......@@ -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
......
......@@ -2,7 +2,7 @@
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/perf_event.h>
#include "../../kernel/cpu/perf_event.h"
#include "../perf_event.h"
#define UNCORE_PMU_NAME_LEN 32
#define UNCORE_PMU_HRTIMER_INTERVAL (60LL * NSEC_PER_SEC)
......
......@@ -11,7 +11,7 @@
#include "pmu.h"
/* x86_pmu.handle_irq definition */
#include "../kernel/cpu/perf_event.h"
#include "../events/perf_event.h"
#define XENPMU_IRQ_PROCESSING 1
struct xenpmu {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment