diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-05-11 11:11:16 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-05-11 11:11:16 -0700 |
| commit | 4922145d869a5b15521c1eee239996323fe4b097 (patch) | |
| tree | 8857c72bfed9e891721923b94ebdaa95fd27ebd6 /include/trace | |
| parent | c9021594feecbce72b1eae96fb2f32cefb857410 (diff) | |
| parent | 8a2755204da8afdbefc317874087e7823ae71f42 (diff) | |
| download | kernel_samsung_tuna-4922145d869a5b15521c1eee239996323fe4b097.zip kernel_samsung_tuna-4922145d869a5b15521c1eee239996323fe4b097.tar.gz kernel_samsung_tuna-4922145d869a5b15521c1eee239996323fe4b097.tar.bz2 | |
Merge branch 'android-3.0' into android-omap-3.0
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/cpufreq_interactive.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/trace/events/cpufreq_interactive.h b/include/trace/events/cpufreq_interactive.h index 0791f27..ea83664 100644 --- a/include/trace/events/cpufreq_interactive.h +++ b/include/trace/events/cpufreq_interactive.h @@ -83,27 +83,27 @@ DEFINE_EVENT(loadeval, cpufreq_interactive_notyet, ); TRACE_EVENT(cpufreq_interactive_boost, - TP_PROTO(char *s), + TP_PROTO(const char *s), TP_ARGS(s), TP_STRUCT__entry( - __field(char *, s) + __string(s, s) ), TP_fast_assign( - __entry->s = s; + __assign_str(s, s); ), - TP_printk("%s", __entry->s) + TP_printk("%s", __get_str(s)) ); TRACE_EVENT(cpufreq_interactive_unboost, - TP_PROTO(char *s), + TP_PROTO(const char *s), TP_ARGS(s), TP_STRUCT__entry( - __field(char *, s) + __string(s, s) ), TP_fast_assign( - __entry->s = s; + __assign_str(s, s); ), - TP_printk("%s", __entry->s) + TP_printk("%s", __get_str(s)) ); #endif /* _TRACE_CPUFREQ_INTERACTIVE_H */ |