1 files changed, 3 insertions, 14 deletions
diff --git a/kernel/kernel/test_support/kapi/interrupts.cpp b/kernel/kernel/test_support/kapi/interrupts.cpp
index 9bd3a515..3791b0dc 100644
--- a/kernel/kernel/test_support/kapi/interrupts.cpp
+++ b/kernel/kernel/test_support/kapi/interrupts.cpp
@@ -1,32 +1,21 @@
 #include <kapi/interrupts.hpp>
 
-#include <atomic>
-#include <map>
-#include <thread>
-
 namespace kapi::interrupts
 {
 
   namespace
   {
-    std::map<std::thread::id, std::atomic_flag> interrupt_state{};
+    thread_local bool interrupt_state{};
   }
 
   auto enabled() -> bool
   {
-    return interrupt_state[std::this_thread::get_id()].test();
+    return interrupt_state;
   }
 
   auto enabled(bool value) -> void
   {
-    if (value)
-    {
-      interrupt_state[std::this_thread::get_id()].test_and_set(std::memory_order::relaxed);
-    }
-    else
-    {
-      interrupt_state[std::this_thread::get_id()].clear(std::memory_order::relaxed);
-    }
+    interrupt_state = value;
   }
 
 }  // namespace kapi::interrupts
 \ No newline at end of file