diff options
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/power.h | 7 | ||||
-rw-r--r-- | include/trace/events/sunrpc.h | 4 | ||||
-rw-r--r-- | include/trace/events/writeback.h | 6 |
3 files changed, 6 insertions, 11 deletions
diff --git a/include/trace/events/power.h b/include/trace/events/power.h index 9e9475c85de5..e5bf9a76f169 100644 --- a/include/trace/events/power.h +++ b/include/trace/events/power.h | |||
@@ -42,7 +42,6 @@ TRACE_EVENT(pstate_sample, | |||
42 | u32 state, | 42 | u32 state, |
43 | u64 mperf, | 43 | u64 mperf, |
44 | u64 aperf, | 44 | u64 aperf, |
45 | u32 energy, | ||
46 | u32 freq | 45 | u32 freq |
47 | ), | 46 | ), |
48 | 47 | ||
@@ -51,7 +50,6 @@ TRACE_EVENT(pstate_sample, | |||
51 | state, | 50 | state, |
52 | mperf, | 51 | mperf, |
53 | aperf, | 52 | aperf, |
54 | energy, | ||
55 | freq | 53 | freq |
56 | ), | 54 | ), |
57 | 55 | ||
@@ -61,7 +59,6 @@ TRACE_EVENT(pstate_sample, | |||
61 | __field(u32, state) | 59 | __field(u32, state) |
62 | __field(u64, mperf) | 60 | __field(u64, mperf) |
63 | __field(u64, aperf) | 61 | __field(u64, aperf) |
64 | __field(u32, energy) | ||
65 | __field(u32, freq) | 62 | __field(u32, freq) |
66 | 63 | ||
67 | ), | 64 | ), |
@@ -72,17 +69,15 @@ TRACE_EVENT(pstate_sample, | |||
72 | __entry->state = state; | 69 | __entry->state = state; |
73 | __entry->mperf = mperf; | 70 | __entry->mperf = mperf; |
74 | __entry->aperf = aperf; | 71 | __entry->aperf = aperf; |
75 | __entry->energy = energy; | ||
76 | __entry->freq = freq; | 72 | __entry->freq = freq; |
77 | ), | 73 | ), |
78 | 74 | ||
79 | TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu energy=%lu freq=%lu ", | 75 | TP_printk("core_busy=%lu scaled=%lu state=%lu mperf=%llu aperf=%llu freq=%lu ", |
80 | (unsigned long)__entry->core_busy, | 76 | (unsigned long)__entry->core_busy, |
81 | (unsigned long)__entry->scaled_busy, | 77 | (unsigned long)__entry->scaled_busy, |
82 | (unsigned long)__entry->state, | 78 | (unsigned long)__entry->state, |
83 | (unsigned long long)__entry->mperf, | 79 | (unsigned long long)__entry->mperf, |
84 | (unsigned long long)__entry->aperf, | 80 | (unsigned long long)__entry->aperf, |
85 | (unsigned long)__entry->energy, | ||
86 | (unsigned long)__entry->freq | 81 | (unsigned long)__entry->freq |
87 | ) | 82 | ) |
88 | 83 | ||
diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index ddc179b7a105..1fef3e6e9436 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h | |||
@@ -83,7 +83,7 @@ DECLARE_EVENT_CLASS(rpc_task_running, | |||
83 | ), | 83 | ), |
84 | 84 | ||
85 | TP_fast_assign( | 85 | TP_fast_assign( |
86 | __entry->client_id = clnt->cl_clid; | 86 | __entry->client_id = clnt ? clnt->cl_clid : -1; |
87 | __entry->task_id = task->tk_pid; | 87 | __entry->task_id = task->tk_pid; |
88 | __entry->action = action; | 88 | __entry->action = action; |
89 | __entry->runstate = task->tk_runstate; | 89 | __entry->runstate = task->tk_runstate; |
@@ -91,7 +91,7 @@ DECLARE_EVENT_CLASS(rpc_task_running, | |||
91 | __entry->flags = task->tk_flags; | 91 | __entry->flags = task->tk_flags; |
92 | ), | 92 | ), |
93 | 93 | ||
94 | TP_printk("task:%u@%u flags=%4.4x state=%4.4lx status=%d action=%pf", | 94 | TP_printk("task:%u@%d flags=%4.4x state=%4.4lx status=%d action=%pf", |
95 | __entry->task_id, __entry->client_id, | 95 | __entry->task_id, __entry->client_id, |
96 | __entry->flags, | 96 | __entry->flags, |
97 | __entry->runstate, | 97 | __entry->runstate, |
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index c7bbbe794e65..464ea82e10db 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h | |||
@@ -287,11 +287,11 @@ TRACE_EVENT(writeback_queue_io, | |||
287 | __field(int, reason) | 287 | __field(int, reason) |
288 | ), | 288 | ), |
289 | TP_fast_assign( | 289 | TP_fast_assign( |
290 | unsigned long older_than_this = work->older_than_this; | 290 | unsigned long *older_than_this = work->older_than_this; |
291 | strncpy(__entry->name, dev_name(wb->bdi->dev), 32); | 291 | strncpy(__entry->name, dev_name(wb->bdi->dev), 32); |
292 | __entry->older = older_than_this; | 292 | __entry->older = older_than_this ? *older_than_this : 0; |
293 | __entry->age = older_than_this ? | 293 | __entry->age = older_than_this ? |
294 | (jiffies - older_than_this) * 1000 / HZ : -1; | 294 | (jiffies - *older_than_this) * 1000 / HZ : -1; |
295 | __entry->moved = moved; | 295 | __entry->moved = moved; |
296 | __entry->reason = work->reason; | 296 | __entry->reason = work->reason; |
297 | ), | 297 | ), |