aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/perf_counter.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/perf_counter.c')
-rw-r--r--kernel/perf_counter.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index ec9c4007a7f9..070f92d3232a 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -2576,7 +2576,7 @@ static void perf_log_throttle(struct perf_counter *counter, int enable)
2576 .time = sched_clock(), 2576 .time = sched_clock(),
2577 }; 2577 };
2578 2578
2579 ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 0, 0); 2579 ret = perf_output_begin(&handle, counter, sizeof(throttle_event), 1, 0);
2580 if (ret) 2580 if (ret)
2581 return; 2581 return;
2582 2582
@@ -3449,8 +3449,6 @@ void perf_counter_exit_task(struct task_struct *child)
3449 struct perf_counter_context *child_ctx; 3449 struct perf_counter_context *child_ctx;
3450 unsigned long flags; 3450 unsigned long flags;
3451 3451
3452 WARN_ON_ONCE(child != current);
3453
3454 child_ctx = child->perf_counter_ctxp; 3452 child_ctx = child->perf_counter_ctxp;
3455 3453
3456 if (likely(!child_ctx)) 3454 if (likely(!child_ctx))