2009-11-18 21:08:09

by Josh Stone

Subject: [PATCH] tracing: Remove the stale include/trace/power.h

Commit 6161352 moved the power tracing to include/trace/events/, but
left the old header behind. No one is using the old header, and its
declarations are now incorrect, so it should be removed.

Signed-off-by: Josh Stone <[email protected]>
Cc: "Frank Ch. Eigler" <[email protected]>
Cc: Arjan van de Ven <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
---
include/trace/power.h | 32 --------------------------------
1 files changed, 0 insertions(+), 32 deletions(-)
delete mode 100644 include/trace/power.h

diff --git a/include/trace/power.h b/include/trace/power.h
deleted file mode 100644
index ef20466..0000000
--- a/include/trace/power.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _TRACE_POWER_H
-#define _TRACE_POWER_H
-
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-enum {
- POWER_NONE = 0,
- POWER_CSTATE = 1,
- POWER_PSTATE = 2,
-};
-
-struct power_trace {
- ktime_t stamp;
- ktime_t end;
- int type;
- int state;
-};
-
-DECLARE_TRACE(power_start,
- TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
- TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_mark,
- TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
- TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_end,
- TP_PROTO(struct power_trace *it),
- TP_ARGS(it));
-
-#endif /* _TRACE_POWER_H */
--
1.6.5.2

2009-11-18 22:05:58

by Arjan van de Ven

Subject: Re: [PATCH] tracing: Remove the stale include/trace/power.h

Josh Stone wrote:
> Commit 6161352 moved the power tracing to include/trace/events/, but
> left the old header behind. No one is using the old header, and its
> declarations are now incorrect, so it should be removed.
>

hmm I could have sworn my patch did that... it was supposed to

Acked-by: Arjan van de Ven <[email protected]>

/

2009-11-19 03:08:04

by Frederic Weisbecker

Subject: Re: [PATCH] tracing: Remove the stale include/trace/power.h

On Wed, Nov 18, 2009 at 01:06:55PM -0800, Josh Stone wrote:
> Commit 6161352 moved the power tracing to include/trace/events/, but
> left the old header behind. No one is using the old header, and its
> declarations are now incorrect, so it should be removed.
>
> Signed-off-by: Josh Stone <[email protected]>
> Cc: "Frank Ch. Eigler" <[email protected]>
> Cc: Arjan van de Ven <[email protected]>
> Cc: Peter Zijlstra <[email protected]>
> Cc: Paul Mackerras <[email protected]>
> Cc: Frederic Weisbecker <[email protected]>
> Cc: Ingo Molnar <[email protected]>
> ---



Yep, it has been completely replaced by the trace event version.
I guess we should take this one for .33

Thanks!

2009-11-19 04:44:01

by Josh Stone

Subject: [tip:tracing/core] tracing: Remove the stale include/trace/power.h

Commit-ID: 192dcf1d1775736627280a5dd4cb0f605b21857a
Gitweb: http://git.kernel.org/tip/192dcf1d1775736627280a5dd4cb0f605b21857a
Author: Josh Stone <[email protected]>
AuthorDate: Wed, 18 Nov 2009 13:06:55 -0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 19 Nov 2009 05:38:40 +0100

tracing: Remove the stale include/trace/power.h

Commit 6161352 moved the power tracing to include/trace/events/,
but left the old header behind. No one is using the old header,
and its declarations are now incorrect, so it should be removed.

Signed-off-by: Josh Stone <[email protected]>
Acked-by: Arjan van de Ven <[email protected]>
Cc: Frank Ch. Eigler <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
include/trace/power.h | 32 --------------------------------
1 files changed, 0 insertions(+), 32 deletions(-)

diff --git a/include/trace/power.h b/include/trace/power.h
deleted file mode 100644
index ef20466..0000000
--- a/include/trace/power.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef _TRACE_POWER_H
-#define _TRACE_POWER_H
-
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-enum {
- POWER_NONE = 0,
- POWER_CSTATE = 1,
- POWER_PSTATE = 2,
-};
-
-struct power_trace {
- ktime_t stamp;
- ktime_t end;
- int type;
- int state;
-};
-
-DECLARE_TRACE(power_start,
- TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
- TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_mark,
- TP_PROTO(struct power_trace *it, unsigned int type, unsigned int state),
- TP_ARGS(it, type, state));
-
-DECLARE_TRACE(power_end,
- TP_PROTO(struct power_trace *it),
- TP_ARGS(it));
-
-#endif /* _TRACE_POWER_H */