aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_counter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 3b2829de5590..c02535bed26f 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -3162,7 +3162,7 @@ static int perf_swcounter_is_counting(struct perf_counter *counter)
3162} 3162}
3163 3163
3164static int perf_swcounter_match(struct perf_counter *counter, 3164static int perf_swcounter_match(struct perf_counter *counter,
3165 enum perf_event_types type, 3165 enum perf_type_id type,
3166 u32 event, struct pt_regs *regs) 3166 u32 event, struct pt_regs *regs)
3167{ 3167{
3168 if (!perf_swcounter_is_counting(counter)) 3168 if (!perf_swcounter_is_counting(counter))
@@ -3194,7 +3194,7 @@ static void perf_swcounter_add(struct perf_counter *counter, u64 nr,
3194} 3194}
3195 3195
3196static void perf_swcounter_ctx_event(struct perf_counter_context *ctx, 3196static void perf_swcounter_ctx_event(struct perf_counter_context *ctx,
3197 enum perf_event_types type, u32 event, 3197 enum perf_type_id type, u32 event,
3198 u64 nr, int nmi, struct pt_regs *regs, 3198 u64 nr, int nmi, struct pt_regs *regs,
3199 u64 addr) 3199 u64 addr)
3200{ 3200{
@@ -3225,7 +3225,7 @@ static int *perf_swcounter_recursion_context(struct perf_cpu_context *cpuctx)
3225 return &cpuctx->recursion[0]; 3225 return &cpuctx->recursion[0];
3226} 3226}
3227 3227
3228static void __perf_swcounter_event(enum perf_event_types type, u32 event, 3228static void __perf_swcounter_event(enum perf_type_id type, u32 event,
3229 u64 nr, int nmi, struct pt_regs *regs, 3229 u64 nr, int nmi, struct pt_regs *regs,
3230 u64 addr) 3230 u64 addr)
3231{ 3231{