diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp index d30d1a1be8c..e8b7d0e702d 100644 --- a/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp +++ b/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp @@ -8,6 +8,7 @@ #include #include #include +#include extern "C" void enter_el2_from_el3(); extern "C" void enter_el1_from_el2(); @@ -93,7 +94,7 @@ void drop_to_exception_level_1() set_up_el1(); break; default: { - Prekernel::panic("FATAL: CPU booted in unsupported exception mode!\r\n"); + PANIC("CPU booted in unsupported exception mode!"); } } } diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp b/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp index 1aaebe7477d..ad09b8ea577 100644 --- a/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp +++ b/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp @@ -12,6 +12,7 @@ #include #include #include +#include // Documentation here for Aarch64 Address Translations // https://documentation-service.arm.com/static/5efa1d23dbdee951c1ccdec5?token= @@ -62,17 +63,17 @@ public: , m_current(start) { if (m_start >= m_end) { - Prekernel::panic("Invalid memory range passed to PageBumpAllocator"); + PANIC("Invalid memory range passed to PageBumpAllocator"); } if ((FlatPtr)m_start % PAGE_TABLE_SIZE != 0 || (FlatPtr)m_end % PAGE_TABLE_SIZE != 0) { - Prekernel::panic("Memory range passed into PageBumpAllocator not aligned to PAGE_TABLE_SIZE"); + PANIC("Memory range passed into PageBumpAllocator not aligned to PAGE_TABLE_SIZE"); } } u64* take_page() { if (m_current == m_end) { - Prekernel::panic("Prekernel pagetable memory exhausted"); + PANIC("Prekernel pagetable memory exhausted"); } u64* page = m_current;