lkml.org 
[lkml]   [2009]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perfcounters/core] perf_counter: Remove unused prev_state field
    Commit-ID:  4a3b3ef5ba929d2698794984bf9c9b02244c49cd
    Gitweb: http://git.kernel.org/tip/4a3b3ef5ba929d2698794984bf9c9b02244c49cd
    Author: Paul Mackerras <paulus@samba.org>
    AuthorDate: Mon, 1 Jun 2009 17:53:16 +1000
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Mon, 1 Jun 2009 10:04:07 +0200

    perf_counter: Remove unused prev_state field

    This removes the prev_state field of struct perf_counter since
    it is now unused. It was only used by the cpu migration
    counter, which doesn't use it any more.

    Signed-off-by: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
    Cc: Marcelo Tosatti <mtosatti@redhat.com>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: John Kacur <jkacur@redhat.com>
    LKML-Reference: <18979.35052.915728.626374@cargo.ozlabs.ibm.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>


    ---
    include/linux/perf_counter.h | 1 -
    kernel/perf_counter.c | 4 ----
    2 files changed, 0 insertions(+), 5 deletions(-)

    diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
    index e630602..82ab958 100644
    --- a/include/linux/perf_counter.h
    +++ b/include/linux/perf_counter.h
    @@ -427,7 +427,6 @@ struct perf_counter {
    const struct pmu *pmu;

    enum perf_counter_active_state state;
    - enum perf_counter_active_state prev_state;
    atomic64_t count;

    /*
    diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
    index c7a20fa..d6d2f9d 100644
    --- a/kernel/perf_counter.c
    +++ b/kernel/perf_counter.c
    @@ -570,7 +570,6 @@ group_sched_in(struct perf_counter *group_counter,
    if (ret)
    return ret < 0 ? ret : 0;

    - group_counter->prev_state = group_counter->state;
    if (counter_sched_in(group_counter, cpuctx, ctx, cpu))
    return -EAGAIN;

    @@ -578,7 +577,6 @@ group_sched_in(struct perf_counter *group_counter,
    * Schedule in siblings as one group (if any):
    */
    list_for_each_entry(counter, &group_counter->sibling_list, list_entry) {
    - counter->prev_state = counter->state;
    if (counter_sched_in(counter, cpuctx, ctx, cpu)) {
    partial_group = counter;
    goto group_error;
    @@ -655,7 +653,6 @@ static void add_counter_to_ctx(struct perf_counter *counter,
    struct perf_counter_context *ctx)
    {
    list_add_counter(counter, ctx);
    - counter->prev_state = PERF_COUNTER_STATE_OFF;
    counter->tstamp_enabled = ctx->time;
    counter->tstamp_running = ctx->time;
    counter->tstamp_stopped = ctx->time;
    @@ -818,7 +815,6 @@ static void __perf_counter_enable(void *info)
    ctx->is_active = 1;
    update_context_time(ctx);

    - counter->prev_state = counter->state;
    if (counter->state >= PERF_COUNTER_STATE_INACTIVE)
    goto unlock;
    counter->state = PERF_COUNTER_STATE_INACTIVE;

    \
     
     \ /
      Last update: 2009-06-01 10:23    [W:0.027 / U:30.340 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site