---

yaml --- r: 147208 b: refs/heads/master c: 65d3708 h: refs/heads/master v: v3
git-mirror · Jan 29, 2009 · f4076e1 · f4076e1
1 parent c24fd6d
commit f4076e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb3f0b59ad005d2d2ecbbe9bd048eab6d1ecbd31
+refs/heads/master: 65d370862f64973611a271ced61864b5f9bb6fc0
diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -1934,7 +1934,8 @@ __perf_counter_exit_task(struct task_struct *child,
 		}
 	}
 
-	kfree(child_counter);
+	if (!child_counter->filp || !atomic_long_read(&child_counter->filp->f_count))
+		kfree(child_counter);
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -1934,7 +1934,8 @@ __perf_counter_exit_task(struct task_struct *child, @@
     		}
     	}
-    	kfree(child_counter);
+    	if (!child_counter->filp || !atomic_long_read(&child_counter->filp->f_count))
+    		kfree(child_counter);
     }
     /*
@@ Expand Down @@