diff options
Diffstat (limited to 'arch/x86/events/intel')
| -rw-r--r-- | arch/x86/events/intel/bts.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/core.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/cqm.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/cstate.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/ds.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/knc.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/lbr.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/p4.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/p6.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/pt.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/rapl.c | 2 | ||||
| -rw-r--r-- | arch/x86/events/intel/uncore.h | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/events/intel/bts.c b/arch/x86/events/intel/bts.c index 2bd4833367a7..b99dc9258c0f 100644 --- a/arch/x86/events/intel/bts.c +++ b/arch/x86/events/intel/bts.c @@ -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; diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 1edf3013e528..a7ec685657a5 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -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. diff --git a/arch/x86/events/intel/cqm.c b/arch/x86/events/intel/cqm.c index d1b623a15ac0..1b064c430140 100644 --- a/arch/x86/events/intel/cqm.c +++ b/arch/x86/events/intel/cqm.c @@ -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 diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c index 1bbf37e8604b..7946c4231169 100644 --- a/arch/x86/events/intel/cstate.c +++ b/arch/x86/events/intel/cstate.c @@ -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, \ diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c index 9677207a2ab1..c8a243d6fc82 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -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 diff --git a/arch/x86/events/intel/knc.c b/arch/x86/events/intel/knc.c index 630bcba91b16..206226e08f49 100644 --- a/arch/x86/events/intel/knc.c +++ b/arch/x86/events/intel/knc.c @@ -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[] = { diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c index 78c88f9293cc..69dd11887dd1 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c @@ -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, diff --git a/arch/x86/events/intel/p4.c b/arch/x86/events/intel/p4.c index 1c72fedd96d3..0a5ede187d9c 100644 --- a/arch/x86/events/intel/p4.c +++ b/arch/x86/events/intel/p4.c @@ -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 /* diff --git a/arch/x86/events/intel/p6.c b/arch/x86/events/intel/p6.c index ee5c4e8bd556..1f5c47ab4c65 100644 --- a/arch/x86/events/intel/p6.c +++ b/arch/x86/events/intel/p6.c @@ -1,7 +1,7 @@ #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 diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c index e56cebe07994..6af7cf71d6b2 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c @@ -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); 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 diff --git a/arch/x86/events/intel/uncore.h b/arch/x86/events/intel/uncore.h index 1dea2046990a..6a1340c7f3cc 100644 --- a/arch/x86/events/intel/uncore.h +++ b/arch/x86/events/intel/uncore.h @@ -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) |