summaryrefslogtreecommitdiff
path: root/Kernel/Memory
diff options
context:
space:
mode:
authorJames Mintram <me@jamesrm.com>2022-04-02 23:47:07 +0100
committerBrian Gianforcaro <b.gianfo@gmail.com>2022-04-02 19:34:20 -0700
commit627fd231d5120427429b22acadc7ca0e920d5d17 (patch)
treec8f29d27912736cb6c4e6043aa3674fb2218b542 /Kernel/Memory
parenta883079b29b39f3a39625849911ff11ef6dfa28b (diff)
downloadserenity-627fd231d5120427429b22acadc7ca0e920d5d17.zip
Kernel: Make Region.cpp compile on aarch64
Diffstat (limited to 'Kernel/Memory')
-rw-r--r--Kernel/Memory/Region.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/Kernel/Memory/Region.cpp b/Kernel/Memory/Region.cpp
index 84790f3e31..3fe340d862 100644
--- a/Kernel/Memory/Region.cpp
+++ b/Kernel/Memory/Region.cpp
@@ -6,7 +6,8 @@
#include <AK/Memory.h>
#include <AK/StringView.h>
-#include <Kernel/Arch/x86/PageFault.h>
+#include <Kernel/Arch/PageDirectory.h>
+#include <Kernel/Arch/PageFault.h>
#include <Kernel/Debug.h>
#include <Kernel/FileSystem/Inode.h>
#include <Kernel/Memory/AnonymousVMObject.h>
@@ -212,9 +213,9 @@ bool Region::map_individual_page_impl(size_t page_index)
pte->set_writable(false);
else
pte->set_writable(is_writable());
- if (Processor::current().has_feature(CPUFeature::NX))
+ if (Processor::current().has_nx())
pte->set_execute_disabled(!is_executable());
- if (Processor::current().has_feature(CPUFeature::PAT))
+ if (Processor::current().has_pat())
pte->set_pat(is_write_combine());
pte->set_user_allowed(user_allowed);
}
@@ -317,7 +318,7 @@ void Region::remap()
ErrorOr<void> Region::set_write_combine(bool enable)
{
- if (enable && !Processor::current().has_feature(CPUFeature::PAT)) {
+ if (enable && !Processor::current().has_pat()) {
dbgln("PAT is not supported, implement MTRR fallback if available");
return Error::from_errno(ENOTSUP);
}