From 8cd288dc9a8efd90f1ffbfdd3041a1f8f92616f2 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 23 Dec 2008 12:29:25 +0100 Subject: [PATCH] --- yaml --- r: 147177 b: refs/heads/master c: 8fe91e61cdc407c7556d3cd71cf20141a25bbcea h: refs/heads/master i: 147175: d2631f2024d654eba48f38570da5cedee564e74b v: v3 --- [refs] | 2 +- trunk/include/linux/perf_counter.h | 1 - trunk/kernel/perf_counter.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9208c71ed235..a60806547ef0 100644 --- 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 index 53af11d3767b..1ea08e9f31ce 100644 --- 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 index 2e73929a6959..48e1dbcdc1cd 100644 --- 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: */