kern/loader: fix git rebase errors
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user