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>

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 53af11d3767bfe75a0aca77bfbc3636d1ccdcba6..1ea08e9f31ceb25503957916d925cc7cfaf9a43f 100644 (file)
--- a/include/linux/perf_counter.h
+++ b/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/kernel/perf_counter.c b/kernel/perf_counter.c
index 2e73929a69595c5ca17416aa93583240f422f06c..48e1dbcdc1cd9c72ccd04aa8dc416884bd584196 100644 (file)
--- a/kernel/perf_counter.c
+++ b/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:
         */