projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
kernel
/
events
/
core.c
diff --git
a/kernel/events/core.c
b/kernel/events/core.c
index 274450efea90eebeb5f3fa4ddb777c2ea2e6ef73..9c51ec3f0f440f35dda1bf9e9b3e02e421388df3 100644
(file)
--- a/
kernel/events/core.c
+++ b/
kernel/events/core.c
@@
-3862,10
+3862,8
@@
static void _free_event(struct perf_event *event)
if (event->ctx)
put_ctx(event->ctx);
- if (event->pmu) {
- exclusive_event_destroy(event);
- module_put(event->pmu->module);
- }
+ exclusive_event_destroy(event);
+ module_put(event->pmu->module);
call_rcu(&event->rcu_head, free_event_rcu);
}