diff options
| author | Alexander Shishkin | 2016-06-07 14:44:15 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2016-06-08 14:30:01 +0200 |
| commit | 62a92c8f553e49270a0ee391b8733da71ab0aebc (patch) | |
| tree | 17bec040a63d2e20a8e245b970d5188bf682e445 /kernel/events/core.c | |
| parent | perf/x86/intel/uncore: Remove SBOX support for Broadwell server (diff) | |
| download | kernel-qcow2-linux-62a92c8f553e49270a0ee391b8733da71ab0aebc.tar.gz kernel-qcow2-linux-62a92c8f553e49270a0ee391b8733da71ab0aebc.tar.xz kernel-qcow2-linux-62a92c8f553e49270a0ee391b8733da71ab0aebc.zip | |
perf/core: Remove a redundant check
There is no way to end up in _free_event() with event::pmu being NULL.
The latter is initialized in event allocation path and remains set
forever. In case of allocation failure, the error path doesn't use
_free_event().
Having the check, however, suggests that it is possible to have a
event::pmu==NULL situation in _free_event() and confuses the robots.
This patch gets rid of the check.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: eranian@google.com
Cc: vince@deater.net
Link: http://lkml.kernel.org/r/1465303455-26032-1-git-send-email-alexander.shishkin@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/events/core.c')
| -rw-r--r-- | kernel/events/core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 050a290c72c7..87e945d6ebb8 100644 --- 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); } |