From 82b07eb8d90fa05d60521e30c4587485ecd13c27 Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Fri, 15 Jun 2012 14:31:31 +0800 Subject: [PATCH] --- yaml --- r: 312249 b: refs/heads/master c: fbfc623f8231c8d8c78aab5841e9c6e5811ab638 h: refs/heads/master i: 312247: a5fe36d05084610627ceb11393d06f93d4f6ce48 v: v3 --- [refs] | 2 +- trunk/kernel/events/core.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 612e6391bc6f..fb7b2c0b33b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b4969b14490a4f65b572b8f180164181104b5e1 +refs/heads/master: fbfc623f8231c8d8c78aab5841e9c6e5811ab638 diff --git a/trunk/kernel/events/core.c b/trunk/kernel/events/core.c index d7d71d6ec972..31d182e01549 100644 --- a/trunk/kernel/events/core.c +++ b/trunk/kernel/events/core.c @@ -6252,6 +6252,8 @@ SYSCALL_DEFINE5(perf_event_open, } } + get_online_cpus(); + event = perf_event_alloc(&attr, cpu, task, group_leader, NULL, NULL, NULL); if (IS_ERR(event)) { @@ -6391,6 +6393,8 @@ SYSCALL_DEFINE5(perf_event_open, perf_unpin_context(ctx); mutex_unlock(&ctx->mutex); + put_online_cpus(); + event->owner = current; mutex_lock(¤t->perf_event_mutex); @@ -6419,6 +6423,7 @@ SYSCALL_DEFINE5(perf_event_open, err_alloc: free_event(event); err_task: + put_online_cpus(); if (task) put_task_struct(task); err_group_fd: