From 85f119a5c4b3d734443eaf99c7f8d87dd668dcad Mon Sep 17 00:00:00 2001 From: Alula Date: Fri, 18 Sep 2026 07:21:22 +0200 Subject: [PATCH] kern/loader: fix git rebase errors --- libraries/libmesosphere/source/kern_k_process.cpp | 4 ++-- libraries/libmesosphere/source/kern_k_thread.cpp | 2 +- stratosphere/loader/source/ldr_process_creation.cpp | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/libmesosphere/source/kern_k_process.cpp b/libraries/libmesosphere/source/kern_k_process.cpp index 88694cfea..0bdcaab85 100644 --- a/libraries/libmesosphere/source/kern_k_process.cpp +++ b/libraries/libmesosphere/source/kern_k_process.cpp @@ -265,7 +265,7 @@ namespace ams::kern { m_is_immortal = immortal; /* Reseed the random generator on application launch. */ - if (params.flags & ams::svc::CreateProcessFlag_IsApplication) { + if (params.flags & ams::svc::CreateProcessParameterFlag_IsApplication) { KSystemControl::ReseedRandomGenerator(); } @@ -338,7 +338,7 @@ namespace ams::kern { m_is_immortal = false; /* Reseed the random generator on application launch. */ - if (params.flags & ams::svc::CreateProcessFlag_IsApplication) { + if (params.flags & ams::svc::CreateProcessParameterFlag_IsApplication) { KSystemControl::ReseedRandomGenerator(); } diff --git a/libraries/libmesosphere/source/kern_k_thread.cpp b/libraries/libmesosphere/source/kern_k_thread.cpp index 374640710..b2ec76302 100644 --- a/libraries/libmesosphere/source/kern_k_thread.cpp +++ b/libraries/libmesosphere/source/kern_k_thread.cpp @@ -287,7 +287,7 @@ namespace ams::kern { std::memset(m_tls_heap_address, 0, ams::svc::ThreadLocalRegionSize); /* If the owning process has a shadow stack, allocate and map a page for this thread. */ - if (owner->GetCreateProcessFlags() & ams::svc::CreateProcessFlag_EnableShadowStack) { + if (owner->GetCreateProcessParameterFlags() & ams::svc::CreateProcessParameterFlag_EnableShadowStack) { /* Allocate the backing page. */ KPageBuffer *page = KPageBuffer::AllocateChecked(); if (page == nullptr) { diff --git a/stratosphere/loader/source/ldr_process_creation.cpp b/stratosphere/loader/source/ldr_process_creation.cpp index fc976a495..9b8386081 100644 --- a/stratosphere/loader/source/ldr_process_creation.cpp +++ b/stratosphere/loader/source/ldr_process_creation.cpp @@ -499,11 +499,6 @@ namespace ams::ldr { flags |= svc::CreateProcessParameterFlag_EnableShadowStack; } - /* 23.0.0+/meso Set EnableShadowStack. */ - if (meta->npdm->flags2 & Npdm::MetaFlag2_EnableShadowStack) { - flags |= svc::CreateProcessFlag_EnableShadowStack; - } - *out = flags; R_SUCCEED(); }