2 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86_64/src/kapi/cio.cpp b/arch/x86_64/src/kapi/cio.cpp
index ade02aa..617146e 100644
--- a/arch/x86_64/src/kapi/cio.cpp
+++ b/arch/x86_64/src/kapi/cio.cpp
@@ -7,7 +7,6 @@
 namespace teachos::cio
 {
 
-  // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
   auto static constinit vga_device = std::optional<vga::x86_64::text::device>{};
 
   auto init() -> void
diff --git a/arch/x86_64/src/kapi/memory.cpp b/arch/x86_64/src/kapi/memory.cpp
index 5234110..73ee669 100644
--- a/arch/x86_64/src/kapi/memory.cpp
+++ b/arch/x86_64/src/kapi/memory.cpp
@@ -148,13 +148,11 @@ namespace teachos::memory
       }
     }
 
-  }  // namespace
+    auto constinit region_based_allocator = std::optional<x86_64::region_allocator>{};
+    auto constinit buffered_allocator = std::optional<x86_64::buffered_allocator<4>>{};
+    auto constinit recursive_page_mapper = std::optional<x86_64::recursive_page_mapper>{};
 
-  // NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables)
-  auto constinit region_based_allocator = std::optional<x86_64::region_allocator>{};
-  auto constinit buffered_allocator = std::optional<x86_64::buffered_allocator<4>>{};
-  auto constinit recursive_page_mapper = std::optional<x86_64::recursive_page_mapper>{};
-  // NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
+  }  // namespace
 
   auto init() -> void
   {