diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-12 10:15:36 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-12-12 10:15:36 -0800 |
| commit | b82fdb62ee3caa1d07f47930cf54f1996fa50fd2 (patch) | |
| tree | b348cb8c2a5c1b2331b0a9af065b320bded5bf7f /include | |
| parent | 8a2ec431d5987e1d93c13208da1dcd0e430114ae (diff) | |
| parent | 61f26de8c058833bb29aa4641717fc5b873724b5 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/sched.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h index dffaffab4bc8..c18d8c89bd12 100644 --- a/include/trace/events/sched.h +++ b/include/trace/events/sched.h @@ -1044,7 +1044,7 @@ TRACE_EVENT(walt_update_history, __field( int, samples ) __field( int, evt ) __field( u64, demand ) - __field(unsigned int, walt_avg ) + __field( u64, walt_avg ) __field(unsigned int, pelt_avg ) __array( u32, hist, RAVG_HIST_SIZE_MAX) __field( int, cpu ) @@ -1066,7 +1066,7 @@ TRACE_EVENT(walt_update_history, ), TP_printk("%d (%s): runtime %u samples %d event %d demand %llu" - " walt %u pelt %u (hist: %u %u %u %u %u) cpu %d", + " walt %llu pelt %u (hist: %u %u %u %u %u) cpu %d", __entry->pid, __entry->comm, __entry->runtime, __entry->samples, __entry->evt, __entry->demand, |