File tree Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Expand file tree Collapse file tree 3 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -712,8 +712,8 @@ ErrorOr<void> Process::do_exec(NonnullRefPtr<OpenFileDescription> main_program_d
712
712
// NOTE: Be careful to not trigger any page faults below!
713
713
714
714
with_mutable_protected_data ([&](auto & protected_data) {
715
- protected_data.promises = protected_data.execpromises . load () ;
716
- protected_data.has_promises = protected_data.has_execpromises . load () ;
715
+ protected_data.promises = protected_data.execpromises ;
716
+ protected_data.has_promises = protected_data.has_execpromises ;
717
717
718
718
protected_data.execpromises = 0 ;
719
719
protected_data.has_execpromises = false ;
Original file line number Diff line number Diff line change @@ -99,10 +99,10 @@ ErrorOr<FlatPtr> Process::sys$fork(RegisterState& regs)
99
99
100
100
with_protected_data ([&](auto & my_protected_data) {
101
101
child->with_mutable_protected_data ([&](auto & child_protected_data) {
102
- child_protected_data.promises = my_protected_data.promises . load () ;
103
- child_protected_data.execpromises = my_protected_data.execpromises . load () ;
104
- child_protected_data.has_promises = my_protected_data.has_promises . load () ;
105
- child_protected_data.has_execpromises = my_protected_data.has_execpromises . load () ;
102
+ child_protected_data.promises = my_protected_data.promises ;
103
+ child_protected_data.execpromises = my_protected_data.execpromises ;
104
+ child_protected_data.has_promises = my_protected_data.has_promises ;
105
+ child_protected_data.has_execpromises = my_protected_data.has_execpromises ;
106
106
child_protected_data.credentials = my_protected_data.credentials ;
107
107
child_protected_data.umask = my_protected_data.umask ;
108
108
child_protected_data.signal_trampoline = my_protected_data.signal_trampoline ;
Original file line number Diff line number Diff line change @@ -120,10 +120,10 @@ class Process final
120
120
RefPtr<TTY> tty;
121
121
bool dumpable { false };
122
122
bool executable_is_setid { false };
123
- Atomic< bool > has_promises { false };
124
- Atomic< u32 > promises { 0 };
125
- Atomic< bool > has_execpromises { false };
126
- Atomic< u32 > execpromises { 0 };
123
+ bool has_promises { false };
124
+ u32 promises { 0 };
125
+ bool has_execpromises { false };
126
+ u32 execpromises { 0 };
127
127
mode_t umask { 022 };
128
128
VirtualAddress signal_trampoline;
129
129
Atomic<u32 > thread_count { 0 };
@@ -520,7 +520,7 @@ class Process final
520
520
521
521
bool has_promises () const
522
522
{
523
- return with_protected_data ([](auto & protected_data) { return protected_data.has_promises . load () ; });
523
+ return with_protected_data ([](auto & protected_data) { return protected_data.has_promises ; });
524
524
}
525
525
bool has_promised (Pledge pledge) const
526
526
{
You can’t perform that action at this time.
0 commit comments