diff options
| author | Timon Kruiper <timonkruiper@gmail.com> | 2022-05-09 23:20:57 +0200 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2022-05-12 23:14:05 +0200 |
| commit | e88cd338f1582f77940fb5583e7fb0967c4f2f25 (patch) | |
| tree | 2a95649d6b1ec2a66180bbec79e5f6033eac97c2 /Kernel/Arch | |
| parent | e7c5fd978b7af3a94eafaec0d4160e0218f0ab69 (diff) | |
| download | serenity-e88cd338f1582f77940fb5583e7fb0967c4f2f25.zip | |
Kernel: Move Prekernel{CPU, Exceptions}.cpp out of Prekernel directory
This lets us delete the Prekernel.h file, and gets us closer to deleting
the Prekernel from the aarch64 Kernel.
Diffstat (limited to 'Kernel/Arch')
| -rw-r--r-- | Kernel/Arch/aarch64/CPU.h | 7 | ||||
| -rw-r--r-- | Kernel/Arch/aarch64/Exceptions.cpp (renamed from Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp) | 2 | ||||
| -rw-r--r-- | Kernel/Arch/aarch64/MMU.cpp (renamed from Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp) | 2 | ||||
| -rw-r--r-- | Kernel/Arch/aarch64/Prekernel/Prekernel.h | 14 | ||||
| -rw-r--r-- | Kernel/Arch/aarch64/Processor.cpp | 1 | ||||
| -rw-r--r-- | Kernel/Arch/aarch64/init.cpp | 1 |
6 files changed, 9 insertions, 18 deletions
diff --git a/Kernel/Arch/aarch64/CPU.h b/Kernel/Arch/aarch64/CPU.h index 7a59983909..a71c4dd73b 100644 --- a/Kernel/Arch/aarch64/CPU.h +++ b/Kernel/Arch/aarch64/CPU.h @@ -7,3 +7,10 @@ #pragma once #define PAGE_MASK (~(FlatPtr)0xfffu) + +namespace Prekernel { + +void drop_to_exception_level_1(); +void init_prekernel_page_tables(); + +} diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp b/Kernel/Arch/aarch64/Exceptions.cpp index 61c394fda0..8d47d59333 100644 --- a/Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp +++ b/Kernel/Arch/aarch64/Exceptions.cpp @@ -5,7 +5,7 @@ */ #include <Kernel/Arch/aarch64/ASM_wrapper.h> -#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h> +#include <Kernel/Arch/aarch64/CPU.h> #include <Kernel/Arch/aarch64/Registers.h> #include <Kernel/Panic.h> diff --git a/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp b/Kernel/Arch/aarch64/MMU.cpp index ad09b8ea57..26388d6cc1 100644 --- a/Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp +++ b/Kernel/Arch/aarch64/MMU.cpp @@ -6,7 +6,7 @@ #include <AK/Types.h> -#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h> +#include <Kernel/Arch/aarch64/CPU.h> #include <Kernel/Arch/aarch64/ASM_wrapper.h> #include <Kernel/Arch/aarch64/RPi/MMIO.h> diff --git a/Kernel/Arch/aarch64/Prekernel/Prekernel.h b/Kernel/Arch/aarch64/Prekernel/Prekernel.h deleted file mode 100644 index 8763be3ccd..0000000000 --- a/Kernel/Arch/aarch64/Prekernel/Prekernel.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2021, James Mintram <me@jamesrm.com> - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -namespace Prekernel { - -void drop_to_exception_level_1(); -void init_prekernel_page_tables(); - -} diff --git a/Kernel/Arch/aarch64/Processor.cpp b/Kernel/Arch/aarch64/Processor.cpp index 36a3df87d7..495de96aaa 100644 --- a/Kernel/Arch/aarch64/Processor.cpp +++ b/Kernel/Arch/aarch64/Processor.cpp @@ -8,7 +8,6 @@ #include <Kernel/Arch/Processor.h> #include <Kernel/Arch/aarch64/ASM_wrapper.h> -#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h> extern "C" uintptr_t vector_table_el1; diff --git a/Kernel/Arch/aarch64/init.cpp b/Kernel/Arch/aarch64/init.cpp index 3d01268af3..b20a9f98d9 100644 --- a/Kernel/Arch/aarch64/init.cpp +++ b/Kernel/Arch/aarch64/init.cpp @@ -12,7 +12,6 @@ #include <Kernel/Arch/Processor.h> #include <Kernel/Arch/aarch64/BootPPMParser.h> -#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h> #include <Kernel/Arch/aarch64/RPi/Framebuffer.h> #include <Kernel/Arch/aarch64/RPi/Mailbox.h> #include <Kernel/Arch/aarch64/RPi/Timer.h> |