aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-23 06:29:25 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-23 06:45:22 -0500
commit8fe91e61cdc407c7556d3cd71cf20141a25bbcea (patch)
tree140962c33ec40dc15b12b2b0ebd11d7fe884903a
parent0dff86aa7b9ec65a6d07167b7afb050b5fc98ddc (diff)
perfcounters: remove ->nr_inherited
Impact: remove dead code nr_inherited was not maintained correctly (not decremented) - and also not used - remove it. Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--include/linux/perf_counter.h1
-rw-r--r--kernel/perf_counter.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 53af11d3767b..1ea08e9f31ce 100644
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -164,7 +164,6 @@ struct perf_counter {
164 struct task_struct *task; 164 struct task_struct *task;
165 struct file *filp; 165 struct file *filp;
166 166
167 unsigned int nr_inherited;
168 struct perf_counter *parent; 167 struct perf_counter *parent;
169 /* 168 /*
170 * Protect attach/detach: 169 * Protect attach/detach:
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 2e73929a6959..48e1dbcdc1cd 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1308,7 +1308,6 @@ inherit_counter(struct perf_counter *parent_counter,
1308 child_ctx->nr_counters++; 1308 child_ctx->nr_counters++;
1309 1309
1310 child_counter->parent = parent_counter; 1310 child_counter->parent = parent_counter;
1311 parent_counter->nr_inherited++;
1312 /* 1311 /*
1313 * inherit into child's child as well: 1312 * inherit into child's child as well:
1314 */ 1313 */