From: tip-bot for Paul Mackerras <paulus@samba.org>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, acme@redhat.com, paulus@samba.org,
hpa@zytor.com, mingo@redhat.com, jkacur@redhat.com,
a.p.zijlstra@chello.nl, efault@gmx.de, mtosatti@redhat.com,
tglx@linutronix.de, cjashfor@linux.vnet.ibm.com, mingo@elte.hu
Subject: [tip:perfcounters/core] perf_counter: Remove unused prev_state field
Date: Tue, 2 Jun 2009 14:18:56 GMT [thread overview]
Message-ID: <tip-bf4e0ed3d027ce581be18496036862131b5f32aa@git.kernel.org> (raw)
In-Reply-To: <18979.35052.915728.626374@cargo.ozlabs.ibm.com>
Commit-ID: bf4e0ed3d027ce581be18496036862131b5f32aa
Gitweb: http://git.kernel.org/tip/bf4e0ed3d027ce581be18496036862131b5f32aa
Author: Paul Mackerras <paulus@samba.org>
AuthorDate: Mon, 1 Jun 2009 17:53:16 +1000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 2 Jun 2009 13:10:55 +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 deb9acf..d970fbc 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 cd94cf3..fbed4d2 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -572,7 +572,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;
@@ -580,7 +579,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;
@@ -657,7 +655,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;
@@ -820,7 +817,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;
next prev parent reply other threads:[~2009-06-02 14:19 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-01 7:48 [PATCH] perf_counter: Provide functions for locking and pinning the context for a task Paul Mackerras
2009-06-01 7:49 ` [PATCH] perf_counter: Allow software counters to count while task is not running Paul Mackerras
2009-06-01 8:19 ` [tip:perfcounters/core] " tip-bot for Paul Mackerras
2009-06-01 7:52 ` [PATCH] perf_counter: Fix cpu migration counter Paul Mackerras
2009-06-01 8:19 ` [tip:perfcounters/core] " tip-bot for Paul Mackerras
2009-06-02 14:18 ` tip-bot for Paul Mackerras
2009-06-01 7:53 ` [PATCH] perf_counter: Remove unused prev_state field Paul Mackerras
2009-06-01 8:19 ` [tip:perfcounters/core] " tip-bot for Paul Mackerras
2009-06-02 14:18 ` tip-bot for Paul Mackerras [this message]
2009-06-01 7:55 ` [PATCH] perf_counter: Provide functions for locking and pinning the context for a task Paul Mackerras
2009-06-01 16:21 ` Ingo Molnar
2009-06-01 21:38 ` Paul Mackerras
2009-06-01 23:14 ` Ingo Molnar
2009-06-02 5:37 ` Paul Mackerras
2009-06-02 7:56 ` Ingo Molnar
2009-06-01 8:18 ` [tip:perfcounters/core] " tip-bot for Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-bf4e0ed3d027ce581be18496036862131b5f32aa@git.kernel.org \
--to=paulus@samba.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=cjashfor@linux.vnet.ibm.com \
--cc=efault@gmx.de \
--cc=hpa@zytor.com \
--cc=jkacur@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=mtosatti@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox