From 4021264201d99372fb1e84899be9ae84a5510415 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 14 Feb 2021 01:38:47 +0100 Subject: [PATCH] Kernel: Make the Region constructor private We can use adopt_own(*new T) instead of make(). --- Kernel/VM/Region.cpp | 4 ++-- Kernel/VM/Region.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Kernel/VM/Region.cpp b/Kernel/VM/Region.cpp index 87032b992f..dcf416149a 100644 --- a/Kernel/VM/Region.cpp +++ b/Kernel/VM/Region.cpp @@ -229,7 +229,7 @@ size_t Region::amount_shared() const NonnullOwnPtr Region::create_user_accessible(Process* owner, const Range& range, NonnullRefPtr vmobject, size_t offset_in_vmobject, String name, u8 access, Cacheable cacheable, bool shared) { - auto region = make(range, move(vmobject), offset_in_vmobject, move(name), access, cacheable, shared); + auto region = adopt_own(*new Region(range, move(vmobject), offset_in_vmobject, move(name), access, cacheable, shared)); if (owner) region->m_owner = owner->make_weak_ptr(); return region; @@ -237,7 +237,7 @@ NonnullOwnPtr Region::create_user_accessible(Process* owner, const Range NonnullOwnPtr Region::create_kernel_only(const Range& range, NonnullRefPtr vmobject, size_t offset_in_vmobject, String name, u8 access, Cacheable cacheable) { - return make(range, move(vmobject), offset_in_vmobject, move(name), access, cacheable, false); + return adopt_own(*new Region(range, move(vmobject), offset_in_vmobject, move(name), access, cacheable, false)); } bool Region::should_cow(size_t page_index) const diff --git a/Kernel/VM/Region.h b/Kernel/VM/Region.h index 0fba189157..5d8b7464a2 100644 --- a/Kernel/VM/Region.h +++ b/Kernel/VM/Region.h @@ -228,9 +228,6 @@ public: Region* m_next { nullptr }; Region* m_prev { nullptr }; - // NOTE: These are public so we can make<> them. - Region(const Range&, NonnullRefPtr, size_t offset_in_vmobject, String, u8 access, Cacheable, bool shared); - bool remap_vmobject_page_range(size_t page_index, size_t page_count); bool is_volatile(VirtualAddress vaddr, size_t size) const; @@ -247,6 +244,8 @@ public: void set_syscall_region(bool b) { m_syscall_region = b; } private: + Region(const Range&, NonnullRefPtr, size_t offset_in_vmobject, String, u8 access, Cacheable, bool shared); + bool do_remap_vmobject_page_range(size_t page_index, size_t page_count); void set_access_bit(Access access, bool b)