aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/events/core.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 403b781daafb..89d34f9bb8cb 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3527,7 +3527,7 @@ static void perf_event_for_each(struct perf_event *event,
3527static int perf_event_period(struct perf_event *event, u64 __user *arg) 3527static int perf_event_period(struct perf_event *event, u64 __user *arg)
3528{ 3528{
3529 struct perf_event_context *ctx = event->ctx; 3529 struct perf_event_context *ctx = event->ctx;
3530 int ret = 0; 3530 int ret = 0, active;
3531 u64 value; 3531 u64 value;
3532 3532
3533 if (!is_sampling_event(event)) 3533 if (!is_sampling_event(event))
@@ -3551,6 +3551,20 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)
3551 event->attr.sample_period = value; 3551 event->attr.sample_period = value;
3552 event->hw.sample_period = value; 3552 event->hw.sample_period = value;
3553 } 3553 }
3554
3555 active = (event->state == PERF_EVENT_STATE_ACTIVE);
3556 if (active) {
3557 perf_pmu_disable(ctx->pmu);
3558 event->pmu->stop(event, PERF_EF_UPDATE);
3559 }
3560
3561 local64_set(&event->hw.period_left, 0);
3562
3563 if (active) {
3564 event->pmu->start(event, PERF_EF_RELOAD);
3565 perf_pmu_enable(ctx->pmu);
3566 }
3567
3554unlock: 3568unlock:
3555 raw_spin_unlock_irq(&ctx->lock); 3569 raw_spin_unlock_irq(&ctx->lock);
3556 3570