kern/loader: fix git rebase errors

This commit is contained in:
Alula
2026-09-18 07:21:22 +02:00
parent 3cfac4c2d8
commit 85f119a5c4
3 changed files with 3 additions and 8 deletions

View File

@@ -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();
}

View File

@@ -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<PageSize>();
if (page == nullptr) {