diff options
| author | Matteo Gmür <matteo.gmuer1@ost.ch> | 2024-11-24 09:03:24 +0000 |
|---|---|---|
| committer | Matteo Gmür <matteo.gmuer1@ost.ch> | 2024-11-24 09:03:24 +0000 |
| commit | 27a56b0e828cecaa5a6a40e3f30b5c0e1785aff6 (patch) | |
| tree | ba6a966c3502d5bb2207ac3d19b053878dc55ed3 /arch/x86_64/src/kernel | |
| parent | 52c1979b22c5e66459659a9cda8d69a2c9b148ca (diff) | |
| parent | 1cd666241b59b800818812220e28b8b8572e4263 (diff) | |
| download | teachos-27a56b0e828cecaa5a6a40e3f30b5c0e1785aff6.tar.xz teachos-27a56b0e828cecaa5a6a40e3f30b5c0e1785aff6.zip | |
Merge branch 'fmorgner/kernel-remapping-patch' into feat_memory_manager
Diffstat (limited to 'arch/x86_64/src/kernel')
| -rw-r--r-- | arch/x86_64/src/kernel/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/src/kernel/main.cpp b/arch/x86_64/src/kernel/main.cpp index 5b0f2c3..8c68a49 100644 --- a/arch/x86_64/src/kernel/main.cpp +++ b/arch/x86_64/src/kernel/main.cpp @@ -2,6 +2,7 @@ #include "arch/exception_handling/assert.hpp" #include "arch/memory/allocator/area_frame_allocator.hpp" +#include "arch/memory/cpu/control_register.hpp" #include "arch/memory/cpu/msr.hpp" #include "arch/memory/multiboot/reader.hpp" #include "arch/memory/paging/kernel_mapper.hpp" |