diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 07:40:31 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 07:40:31 +0100 |
commit | b5c00a3a412857d6f07970984068c450429e051c (patch) | |
tree | 1fde50630cbc24e11a45169f717f281db8eb6dcc /include/trace/power.h | |
parent | sh: pfc: Fixup type mismatch in debug printks. (diff) | |
parent | Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/l... (diff) | |
download | linux-b5c00a3a412857d6f07970984068c450429e051c.tar.xz linux-b5c00a3a412857d6f07970984068c450429e051c.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
Diffstat (limited to 'include/trace/power.h')
-rw-r--r-- | 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 ef204666e983..000000000000 --- 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 */ |