42a05dcd81
This commit updates the standard kernel to 3.10.0-838 and the rt kernel to 3.10.0-802. Driver updates to ensure compilation also added (Mellanox driver, specifically) Depends-On: https://review.openstack.org/580689 Change-Id: Ie52d7df2f097ea03158b3b3a3334b61833cbdf57 Story: 2002761 Signed-off-by: Jason McKenna <jason.mckenna@windriver.com> Story: 2002761 Task: 22841
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From d249a02d441998c43aeb1755c85cffb062628500 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <d249a02d441998c43aeb1755c85cffb062628500.1528226387.git.Jim.Somerville@windriver.com>
|
|
In-Reply-To: <c8270e79f6b7008fde44b8d5aa6314d8cf89d3ed.1528226387.git.Jim.Somerville@windriver.com>
|
|
References: <c8270e79f6b7008fde44b8d5aa6314d8cf89d3ed.1528226387.git.Jim.Somerville@windriver.com>
|
|
From: Jim Somerville <Jim.Somerville@windriver.com>
|
|
Date: Thu, 22 Dec 2016 17:54:11 -0500
|
|
Subject: [PATCH 14/32] Add missing ifdef around max latency variable
|
|
|
|
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
|
|
---
|
|
kernel/trace/trace_hwlat.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/kernel/trace/trace_hwlat.c b/kernel/trace/trace_hwlat.c
|
|
index 4b30d8b..1bb578c 100644
|
|
--- a/kernel/trace/trace_hwlat.c
|
|
+++ b/kernel/trace/trace_hwlat.c
|
|
@@ -167,7 +167,9 @@ void trace_hwlat_callback(bool enter)
|
|
*/
|
|
static int get_sample(void)
|
|
{
|
|
+#ifdef CONFIG_TRACER_MAX_TRACE
|
|
struct trace_array *tr = hwlat_trace;
|
|
+#endif
|
|
time_type start, t1, t2, last_t2;
|
|
s64 diff, total, last_total = 0;
|
|
u64 sample = 0;
|
|
@@ -254,9 +256,11 @@ static int get_sample(void)
|
|
s.nmi_count = nmi_count;
|
|
trace_hwlat_sample(&s);
|
|
|
|
+#ifdef CONFIG_TRACER_MAX_TRACE
|
|
/* Keep a running maximum ever recorded hardware latency */
|
|
if (sample > tr->max_latency)
|
|
tr->max_latency = sample;
|
|
+#endif
|
|
}
|
|
|
|
out:
|
|
@@ -582,7 +586,9 @@ static int hwlat_tracer_init(struct trace_array *tr)
|
|
|
|
disable_migrate = false;
|
|
hwlat_data.count = 0;
|
|
+#ifdef CONFIG_TRACER_MAX_TRACE
|
|
tr->max_latency = 0;
|
|
+#endif
|
|
save_tracing_thresh = tracing_thresh;
|
|
|
|
/* tracing_thresh is in nsecs, we speak in usecs */
|
|
--
|
|
1.8.3.1
|
|
|