From 399f38f2ae6481aee9d7b7a3a7ad436b127dd0bd Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@ost.ch>
Date: Sun, 19 Jul 2026 17:54:35 +0200
Subject: kstd: move bitfiled_enum header

---
 arch/x86_64/arch/cpu/control_register.hpp        | 8 ++++----
 arch/x86_64/arch/cpu/model_specific_register.hpp | 8 ++++----
 arch/x86_64/arch/memory/page_table.hpp           | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'arch/x86_64')

diff --git a/arch/x86_64/arch/cpu/control_register.hpp b/arch/x86_64/arch/cpu/control_register.hpp
index ad307081..127d1e24 100644
--- a/arch/x86_64/arch/cpu/control_register.hpp
+++ b/arch/x86_64/arch/cpu/control_register.hpp
@@ -5,7 +5,7 @@
 
 #include <kapi/memory.hpp>
 
-#include <kstd/ext/bitfield_enum.hpp>
+#include <kstd/bitfield_enum.hpp>
 
 #include <cstdint>
 #include <string_view>
@@ -60,7 +60,7 @@ namespace arch::cpu
   };
 }  // namespace arch::cpu
 
-namespace kstd::ext
+namespace kstd
 {
   template<>
   struct is_bitfield_enum<arch::cpu::cr0_flags> : std::true_type
@@ -71,7 +71,7 @@ namespace kstd::ext
   struct is_bitfield_enum<arch::cpu::cr3_flags> : std::true_type
   {
   };
-}  // namespace kstd::ext
+}  // namespace kstd
 
 namespace arch::cpu
 {
@@ -95,7 +95,7 @@ namespace arch::cpu
   //! @note This specialization provides the implementation for the case in which the value type of the control register
   //! is an enum.
   template<typename Derived, typename ValueType>
-  struct control_register_with_flags<Derived, ValueType, std::enable_if_t<kstd::ext::bitfield_enum<ValueType>>>
+  struct control_register_with_flags<Derived, ValueType, std::enable_if_t<kstd::bitfield_enum<ValueType>>>
   {
     //! The type of the flags used by this control register
     using flags = ValueType;
diff --git a/arch/x86_64/arch/cpu/model_specific_register.hpp b/arch/x86_64/arch/cpu/model_specific_register.hpp
index cf07737f..1410c343 100644
--- a/arch/x86_64/arch/cpu/model_specific_register.hpp
+++ b/arch/x86_64/arch/cpu/model_specific_register.hpp
@@ -3,7 +3,7 @@
 
 // IWYU pragma: private, include <x86_64/cpu/registers.hpp>
 
-#include <kstd/ext/bitfield_enum.hpp>
+#include <kstd/bitfield_enum.hpp>
 
 #include <bit>
 #include <cstdint>
@@ -27,7 +27,7 @@ namespace arch::cpu
 
 }  // namespace arch::cpu
 
-namespace kstd::ext
+namespace kstd
 {
 
   template<>
@@ -35,7 +35,7 @@ namespace kstd::ext
   {
   };
 
-}  // namespace kstd::ext
+}  // namespace kstd
 
 namespace arch::cpu
 {
@@ -62,7 +62,7 @@ namespace arch::cpu
   //! @note This specialization provides the implementation for the case in which the value type of the model specific
   //! register is a bitfield enum.
   template<typename Derived, typename ValueType>
-  struct model_specific_register_with_flags<Derived, ValueType, std::enable_if_t<kstd::ext::bitfield_enum<ValueType>>>
+  struct model_specific_register_with_flags<Derived, ValueType, std::enable_if_t<kstd::bitfield_enum<ValueType>>>
   {
     //! The of the flags used by this model specific register.
     using flags = ValueType;
diff --git a/arch/x86_64/arch/memory/page_table.hpp b/arch/x86_64/arch/memory/page_table.hpp
index f288e3da..5bb4e1aa 100644
--- a/arch/x86_64/arch/memory/page_table.hpp
+++ b/arch/x86_64/arch/memory/page_table.hpp
@@ -3,7 +3,7 @@
 
 #include <kapi/memory.hpp>
 
-#include <kstd/ext/bitfield_enum.hpp>
+#include <kstd/bitfield_enum.hpp>
 #include <kstd/units.hpp>
 
 #include <array>
@@ -36,7 +36,7 @@ namespace arch::memory
       //! An entry in a page table may have any combination of these flags active at the same time. The final flags of a
       //! page are determined as the strictest combination (logical AND) of all flags along the hierarchy.
       //!
-      //! @note This is a bitfield enum as defined by kstd::ext::bitfield_enum.
+      //! @note This is a bitfield enum as defined by kstd::bitfield_enum.
       enum struct flags : std::uint64_t
       {
         empty = 0,
@@ -146,13 +146,13 @@ namespace arch::memory
 
 }  // namespace arch::memory
 
-namespace kstd::ext
+namespace kstd
 {
   template<>
   struct is_bitfield_enum<arch::memory::page_table::entry::flags> : std::true_type
   {
   };
-}  // namespace kstd::ext
+}  // namespace kstd
 
 namespace arch::memory
 {
-- 
cgit v1.2.3