From ea9cf8b6ab6a3941ecb4727723e8e38fbd6b4bb8 Mon Sep 17 00:00:00 2001
From: Timon Kruiper <timonkruiper@gmail.com>
Date: Mon, 16 May 2022 14:37:50 +0200
Subject: [PATCH] Kernel: Separate NonMaskableInterruptDisabler into its own
 file

This is for the upcoming change to make InterruptDisabler class work for
the aarch64 build.
---
 Kernel/Arch/x86/InterruptDisabler.h           | 13 ---------
 .../Arch/x86/NonMaskableInterruptDisabler.h   | 28 +++++++++++++++++++
 Kernel/Time/RTC.cpp                           |  1 +
 3 files changed, 29 insertions(+), 13 deletions(-)
 create mode 100644 Kernel/Arch/x86/NonMaskableInterruptDisabler.h

diff --git a/Kernel/Arch/x86/InterruptDisabler.h b/Kernel/Arch/x86/InterruptDisabler.h
index 094ca04c30..941ddaab2b 100644
--- a/Kernel/Arch/x86/InterruptDisabler.h
+++ b/Kernel/Arch/x86/InterruptDisabler.h
@@ -35,17 +35,4 @@ private:
     u32 m_flags;
 };
 
-class NonMaskableInterruptDisabler {
-public:
-    NonMaskableInterruptDisabler()
-    {
-        IO::out8(0x70, IO::in8(0x70) | 0x80);
-    }
-
-    ~NonMaskableInterruptDisabler()
-    {
-        IO::out8(0x70, IO::in8(0x70) & 0x7F);
-    }
-};
-
 }
diff --git a/Kernel/Arch/x86/NonMaskableInterruptDisabler.h b/Kernel/Arch/x86/NonMaskableInterruptDisabler.h
new file mode 100644
index 0000000000..881f884541
--- /dev/null
+++ b/Kernel/Arch/x86/NonMaskableInterruptDisabler.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <AK/Types.h>
+
+#include <Kernel/Arch/x86/IO.h>
+
+namespace Kernel {
+
+class NonMaskableInterruptDisabler {
+public:
+    NonMaskableInterruptDisabler()
+    {
+        IO::out8(0x70, IO::in8(0x70) | 0x80);
+    }
+
+    ~NonMaskableInterruptDisabler()
+    {
+        IO::out8(0x70, IO::in8(0x70) & 0x7F);
+    }
+};
+
+}
diff --git a/Kernel/Time/RTC.cpp b/Kernel/Time/RTC.cpp
index 86c2d38842..f8b7a690bb 100644
--- a/Kernel/Time/RTC.cpp
+++ b/Kernel/Time/RTC.cpp
@@ -6,6 +6,7 @@
 
 #include <Kernel/Arch/x86/IO.h>
 #include <Kernel/Arch/x86/InterruptDisabler.h>
+#include <Kernel/Arch/x86/NonMaskableInterruptDisabler.h>
 #include <Kernel/CMOS.h>
 #include <Kernel/Time/RTC.h>
 #include <Kernel/Time/TimeManagement.h>