mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-11-17 09:31:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

kern: fix debug build for [[nodiscard]] changes

Browse Source
This commit is contained in:
Michael Scire 2025-11-12 17:32:43 -07:00 committed by SciresM
parent c05d91f44a
commit 0fb9481e59
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/libmesosphere/include/mesosphere/arch/arm64/kern_k_page_table.hpp
View File

@ -199,7 +199,7 @@ namespace ams::kern::arch::arm64 {
NOINLINE void InitializeForKernel(void *table, KVirtualAddress start, KVirtualAddress end); NOINLINE void InitializeForKernel(void *table, KVirtualAddress start, KVirtualAddress end);
NOINLINE Result InitializeForProcess(ams::svc::CreateProcessFlag flags, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_address, size_t code_size, KSystemResource *system_resource, KResourceLimit *resource_limit, size_t process_index); NOINLINE Result InitializeForProcess(ams::svc::CreateProcessFlag flags, bool from_back, KMemoryManager::Pool pool, KProcessAddress code_address, size_t code_size, KSystemResource *system_resource, KResourceLimit *resource_limit, size_t process_index);
Result Finalize(); void Finalize();
static void NoteUpdatedCallback(const void *pt) { static void NoteUpdatedCallback(const void *pt) {
/* Note the update. */ /* Note the update. */

2
libraries/libmesosphere/include/mesosphere/kern_k_handle_table.hpp
View File

@ -105,7 +105,7 @@ namespace ams::kern {
constexpr ALWAYS_INLINE size_t GetCount() const { return m_count; } constexpr ALWAYS_INLINE size_t GetCount() const { return m_count; }
constexpr ALWAYS_INLINE size_t GetMaxCount() const { return m_max_count; } constexpr ALWAYS_INLINE size_t GetMaxCount() const { return m_max_count; }
MESOSPHERE_NOINLINE_IF_DEBUG Result Finalize(); MESOSPHERE_NOINLINE_IF_DEBUG void Finalize();
MESOSPHERE_NOINLINE_IF_DEBUG bool Remove(ams::svc::Handle handle); MESOSPHERE_NOINLINE_IF_DEBUG bool Remove(ams::svc::Handle handle);
template<typename T = KAutoObject> template<typename T = KAutoObject>

4
libraries/libmesosphere/source/arch/arm64/kern_k_page_table.cpp
View File

@ -151,7 +151,7 @@ namespace ams::kern::arch::arm64 {
R_SUCCEED(); R_SUCCEED();
} }
Result KPageTable::Finalize() { void KPageTable::Finalize() {
/* Only process tables should be finalized. */ /* Only process tables should be finalized. */
MESOSPHERE_ASSERT(!this->IsKernel()); MESOSPHERE_ASSERT(!this->IsKernel());
@ -269,8 +269,6 @@ namespace ams::kern::arch::arm64 {
/* Perform inherited finalization. */ /* Perform inherited finalization. */
KPageTableBase::Finalize(); KPageTableBase::Finalize();
} }
R_SUCCEED();
} }
Result KPageTable::OperateImpl(PageLinkedList *page_list, KProcessAddress virt_addr, size_t num_pages, KPhysicalAddress phys_addr, bool is_pa_valid, const KPageProperties properties, OperationType operation, bool reuse_ll) { Result KPageTable::OperateImpl(PageLinkedList *page_list, KProcessAddress virt_addr, size_t num_pages, KPhysicalAddress phys_addr, bool is_pa_valid, const KPageProperties properties, OperationType operation, bool reuse_ll) {

2
libraries/libmesosphere/source/board/nintendo/nx/kern_k_device_page_table.cpp
View File

@ -709,7 +709,7 @@ namespace ams::kern::board::nintendo::nx {
/* Install interrupt handler. */ /* Install interrupt handler. */
#if defined(MESOSPHERE_ENABLE_MEMORY_CONTROLLER_INTERRUPT) #if defined(MESOSPHERE_ENABLE_MEMORY_CONTROLLER_INTERRUPT)
{ {
Kernel::GetInterruptManager().BindHandler(std::addressof(g_mc_interrupt_task), KInterruptName_MemoryController, GetCurrentCoreId(), KInterruptController::PriorityLevel_High, true, true); MESOSPHERE_R_ABORT_UNLESS(Kernel::GetInterruptManager().BindHandler(std::addressof(g_mc_interrupt_task), KInterruptName_MemoryController, GetCurrentCoreId(), KInterruptController::PriorityLevel_High, true, true));
} }
#endif #endif
} }

4
libraries/libmesosphere/source/kern_k_handle_table.cpp
View File

@ -17,7 +17,7 @@
namespace ams::kern { namespace ams::kern {
Result KHandleTable::Finalize() { void KHandleTable::Finalize() {
MESOSPHERE_ASSERT_THIS(); MESOSPHERE_ASSERT_THIS();
/* Get the table and clear our record of it. */ /* Get the table and clear our record of it. */
@ -35,8 +35,6 @@ namespace ams::kern {
obj->Close(); obj->Close();
} }
} }
R_SUCCEED();
} }
bool KHandleTable::Remove(ams::svc::Handle handle) { bool KHandleTable::Remove(ams::svc::Handle handle) {