diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-11-12 13:57:30 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2019-11-12 13:57:30 +0100 |
| commit | 401bf3f29b1aa6d9ca32bd3252fc9beabe93d80b (patch) | |
| tree | 6dd86325823a9b44b6e696acbd077e68c47d3108 /kernel/trace/trace_hwlat.c | |
| parent | 5a9c845fe261dec87f892f3fd3c2e32604d952c0 (diff) | |
| parent | b260a0862e3a9fccdac23ec3b783911b098c1c74 (diff) | |
Merge tag 'v5.3.10' into toradex_5.3.ytoradex_5.3.y
This is the 5.3.10 stable release
Diffstat (limited to 'kernel/trace/trace_hwlat.c')
| -rw-r--r-- | kernel/trace/trace_hwlat.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c index fa95139445b2..862f4b0139fc 100644 --- a/kernel/trace/trace_hwlat.c +++ b/kernel/trace/trace_hwlat.c @@ -150,7 +150,7 @@ void trace_hwlat_callback(bool enter) if (enter) nmi_ts_start = time_get(); else - nmi_total_ts = time_get() - nmi_ts_start; + nmi_total_ts += time_get() - nmi_ts_start; } if (enter) @@ -256,6 +256,8 @@ static int get_sample(void) /* Keep a running maximum ever recorded hardware latency */ if (sample > tr->max_latency) tr->max_latency = sample; + if (outer_sample > tr->max_latency) + tr->max_latency = outer_sample; } out: |