From 44780d3ce76546568e3b6f968fd04240cca49829 Mon Sep 17 00:00:00 2001
From: Axel Heider <axelheider@gmx.de>
Date: Mon, 7 Nov 2022 02:08:34 +0100
Subject: [PATCH] benchmark: move ksUserLogBuffer declaration

Signed-off-by: Axel Heider <axelheider@gmx.de>
---
 src/benchmark/benchmark.c | 9 ++++++---
 src/model/statedata.c     | 5 -----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/benchmark/benchmark.c b/src/benchmark/benchmark.c
index 7dd3215a1d..15b1e3bfaa 100644
--- a/src/benchmark/benchmark.c
+++ b/src/benchmark/benchmark.c
@@ -5,9 +5,6 @@
  */
 
 #include <config.h>
-
-#ifdef CONFIG_ENABLE_BENCHMARKS
-
 #include <types.h>
 #include <mode/machine.h>
 #include <benchmark/benchmark.h>
@@ -22,6 +19,11 @@ seL4_Word ksLogIndex = 0;
 paddr_t ksUserLogBuffer;
 #endif /* CONFIG_KERNEL_LOG_BUFFER */
 
+#if defined(CONFIG_DEBUG_BUILD) || defined(CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES)
+#include <sel4/benchmark_track_types.h>
+kernel_entry_t ksKernelEntry;
+#endif /* CONFIG_DEBUG_BUILD || CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES */
+
 #if defined(CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES) || defined(CONFIG_BENCHMARK_TRACK_UTILISATION)
 timestamp_t ksEnter;
 #endif /* CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES CONFIG_BENCHMARK_TRACK_UTILISATION */
@@ -96,6 +98,7 @@ void trace_point_stop(word_t id)
 
 #endif /* ENABLE_KERNEL_TRACEPOINTS */
 
+#ifdef CONFIG_ENABLE_BENCHMARKS
 
 exception_t handle_SysBenchmarkFlushCaches(void)
 {
diff --git a/src/model/statedata.c b/src/model/statedata.c
index 32e143bc4e..4f3c802bd6 100644
--- a/src/model/statedata.c
+++ b/src/model/statedata.c
@@ -12,7 +12,6 @@
 #include <model/smp.h>
 #include <object/structures.h>
 #include <object/tcb.h>
-#include <benchmark/benchmark_track.h>
 
 /* Collective cpu states, including both pre core architecture dependant and independent data */
 SMP_STATE_DEFINE(smpStatedata_t, ksSMP[CONFIG_MAX_NUM_NODES] ALIGN(L1_CACHE_LINE_SIZE));
@@ -104,7 +103,3 @@ SECTION("._idle_thread") char ksIdleThreadTCB[CONFIG_MAX_NUM_NODES][BIT(seL4_TCB
 /* Idle thread Schedcontexts */
 char ksIdleThreadSC[CONFIG_MAX_NUM_NODES][BIT(seL4_MinSchedContextBits)] ALIGN(BIT(seL4_MinSchedContextBits));
 #endif
-
-#if (defined CONFIG_DEBUG_BUILD || defined CONFIG_BENCHMARK_TRACK_KERNEL_ENTRIES)
-kernel_entry_t ksKernelEntry;
-#endif /* DEBUG */