diff --git a/[refs] b/[refs] index 6c7e90776f1f..a39cdc3c9c09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28009ce4a8130af7260a9271901b4419834ad152 +refs/heads/master: b7526f0ca6dc68f57ca467ce503151b1d476a3e4 diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c index e4aee519572d..2293e0b084a9 100644 --- a/trunk/kernel/events/core.c +++ b/trunk/kernel/events/core.c @@ -748,6 +748,7 @@ static u64 perf_event_time(struct perf_event *event) /* * Update the total_time_enabled and total_time_running fields for a event. + * The caller of this function needs to hold the ctx->lock. */ static void update_event_times(struct perf_event *event) {