projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
kernel
/
trace
/
trace_uprobe.c
diff --git
a/kernel/trace/trace_uprobe.c
b/kernel/trace/trace_uprobe.c
index
79e52d9
..
bd0c9b1
100644
(file)
--- a/
kernel/trace/trace_uprobe.c
+++ b/
kernel/trace/trace_uprobe.c
@@
-728,9
+728,15
@@
static int uprobe_buffer_enable(void)
static void uprobe_buffer_disable(void)
{
static void uprobe_buffer_disable(void)
{
+ int cpu;
+
BUG_ON(!mutex_is_locked(&event_mutex));
if (--uprobe_buffer_refcnt == 0) {
BUG_ON(!mutex_is_locked(&event_mutex));
if (--uprobe_buffer_refcnt == 0) {
+ for_each_possible_cpu(cpu)
+ free_page((unsigned long)per_cpu_ptr(uprobe_cpu_buffer,
+ cpu)->buf);
+
free_percpu(uprobe_cpu_buffer);
uprobe_cpu_buffer = NULL;
}
free_percpu(uprobe_cpu_buffer);
uprobe_cpu_buffer = NULL;
}