projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'oprofile/urgent' into oprofile/core
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
oprofile
/
common.c
diff --git
a/arch/arm/oprofile/common.c
b/arch/arm/oprofile/common.c
index d660cb8dab363db51fcb46a15c784500895c2a5a..bd7426ffedd0fbc632032c54b00c915ba7d4ccd6 100644
(file)
--- a/
arch/arm/oprofile/common.c
+++ b/
arch/arm/oprofile/common.c
@@
-102,6
+102,7
@@
static int op_create_counter(int cpu, int event)
if (IS_ERR(pevent)) {
ret = PTR_ERR(pevent);
} else if (pevent->state != PERF_EVENT_STATE_ACTIVE) {
+ perf_event_release_kernel(pevent);
pr_warning("oprofile: failed to enable event %d "
"on CPU %d\n", event, cpu);
ret = -EBUSY;