---

yaml --- r: 147177 b: refs/heads/master c: 8fe91e6 h: refs/heads/master i: 147175: d2631f2 v: v3
git-mirror · Dec 23, 2008 · 8cd288d · 8cd288d
1 parent 8cd8549
commit 8cd288d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0dff86aa7b9ec65a6d07167b7afb050b5fc98ddc
+refs/heads/master: 8fe91e61cdc407c7556d3cd71cf20141a25bbcea
diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h
@@ -164,7 +164,6 @@ struct perf_counter {
 	struct task_struct		*task;
 	struct file			*filp;
 
-	unsigned int			nr_inherited;
 	struct perf_counter		*parent;
 	/*
 	 * Protect attach/detach:

diff --git a/trunk/kernel/perf_counter.c b/trunk/kernel/perf_counter.c
@@ -1308,7 +1308,6 @@ inherit_counter(struct perf_counter *parent_counter,
 	child_ctx->nr_counters++;
 
 	child_counter->parent = parent_counter;
-	parent_counter->nr_inherited++;
 	/*
 	 * inherit into child's child as well:
 	 */