This patch makes the perf_ctx_lock()/perf_ctx_unlock() inlined functions available throughout the perf_events code and not just in kernel/events/core.c This will help with the next patch.
Signed-off-by: Stephane Eranian <eran...@google.com> --- include/linux/perf_event.h | 16 ++++++++++++++++ kernel/events/core.c | 16 ---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 2a1405e907ec..514de997696b 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1283,6 +1283,22 @@ perf_event_addr_filters(struct perf_event *event) return ifh; } +static inline void perf_ctx_lock(struct perf_cpu_context *cpuctx, + struct perf_event_context *ctx) +{ + raw_spin_lock(&cpuctx->ctx.lock); + if (ctx) + raw_spin_lock(&ctx->lock); +} + +static inline void perf_ctx_unlock(struct perf_cpu_context *cpuctx, + struct perf_event_context *ctx) +{ + if (ctx) + raw_spin_unlock(&ctx->lock); + raw_spin_unlock(&cpuctx->ctx.lock); +} + extern void perf_event_addr_filters_sync(struct perf_event *event); extern int perf_output_begin(struct perf_output_handle *handle, diff --git a/kernel/events/core.c b/kernel/events/core.c index 833f1bccf25a..429bf6d8be95 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -148,22 +148,6 @@ __get_cpu_context(struct perf_event_context *ctx) return this_cpu_ptr(ctx->pmu->pmu_cpu_context); } -static void perf_ctx_lock(struct perf_cpu_context *cpuctx, - struct perf_event_context *ctx) -{ - raw_spin_lock(&cpuctx->ctx.lock); - if (ctx) - raw_spin_lock(&ctx->lock); -} - -static void perf_ctx_unlock(struct perf_cpu_context *cpuctx, - struct perf_event_context *ctx) -{ - if (ctx) - raw_spin_unlock(&ctx->lock); - raw_spin_unlock(&cpuctx->ctx.lock); -} - #define TASK_TOMBSTONE ((void *)-1L) static bool is_kernel_event(struct perf_event *event) -- 2.21.0.392.gf8f6787159e-goog