diff --git a/Kernel/Arch/aarch64/CrashHandler.cpp b/Kernel/Arch/aarch64/CrashHandler.cpp
deleted file mode 100644
index 0dec16dff1..0000000000
--- a/Kernel/Arch/aarch64/CrashHandler.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2018-2021, Andreas Kling <kling@serenityos.org>
- *
- * SPDX-License-Identifier: BSD-2-Clause
- */
-
-#include <AK/Forward.h>
-
-#include <Kernel/Arch/CPU.h>
-#include <Kernel/Arch/RegisterState.h>
-
-namespace Kernel {
-
-void handle_crash(Kernel::RegisterState const&, char const*, int, bool)
-{
-    TODO_AARCH64();
-}
-
-}
diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt
index 8225254504..7b5e6d9f6a 100644
--- a/Kernel/CMakeLists.txt
+++ b/Kernel/CMakeLists.txt
@@ -41,6 +41,7 @@ set(KERNEL_SOURCES
     Bus/VirtIO/RNG.cpp
     CommandLine.cpp
     Coredump.cpp
+    CrashHandler.cpp
     Credentials.cpp
     Devices/AsyncDeviceRequest.cpp
     Devices/Audio/AC97.cpp
@@ -413,7 +414,6 @@ if ("${SERENITY_ARCH}" STREQUAL "x86_64")
         ${CMAKE_CURRENT_SOURCE_DIR}/Arch/x86_64/ASM_wrapper.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Arch/x86_64/CPU.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Arch/x86_64/CPUID.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/Arch/x86_64/CrashHandler.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Arch/x86_64/InterruptManagement.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Arch/x86_64/Interrupts.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/Arch/x86_64/PageDirectory.cpp
@@ -454,7 +454,6 @@ elseif("${SERENITY_ARCH}" STREQUAL "aarch64")
         Arch/aarch64/boot.S
         Arch/aarch64/BootPPMParser.cpp
         Arch/aarch64/CPUID.cpp
-        Arch/aarch64/CrashHandler.cpp
         Arch/aarch64/CurrentTime.cpp
         Arch/aarch64/Dummy.cpp
         Arch/aarch64/init.cpp
diff --git a/Kernel/Arch/x86_64/CrashHandler.cpp b/Kernel/CrashHandler.cpp
similarity index 97%
rename from Kernel/Arch/x86_64/CrashHandler.cpp
rename to Kernel/CrashHandler.cpp
index 10130cb990..1e0af3d184 100644
--- a/Kernel/Arch/x86_64/CrashHandler.cpp
+++ b/Kernel/CrashHandler.cpp
@@ -36,7 +36,7 @@ void handle_crash(Kernel::RegisterState const& regs, char const* description, in
 
     if (crashed_in_kernel) {
         process.address_space().with([&](auto& space) { space->dump_regions(); });
-        PANIC("Crash in ring 0");
+        PANIC("Crash in kernel");
     }
 
     process.crash(signal, regs.ip(), out_of_memory);