Merge branch 'master' into for-next
This commit is contained in:
@@ -2047,8 +2047,8 @@ static bool do_signal_stop(int signr)
|
||||
if (task_set_jobctl_pending(current, signr | gstop))
|
||||
sig->group_stop_count++;
|
||||
|
||||
for (t = next_thread(current); t != current;
|
||||
t = next_thread(t)) {
|
||||
t = current;
|
||||
while_each_thread(current, t) {
|
||||
/*
|
||||
* Setting state to TASK_STOPPED for a group
|
||||
* stop is always done with the siglock held,
|
||||
@@ -3125,8 +3125,7 @@ int do_sigaction(int sig, struct k_sigaction *act, struct k_sigaction *oact)
|
||||
rm_from_queue_full(&mask, &t->signal->shared_pending);
|
||||
do {
|
||||
rm_from_queue_full(&mask, &t->pending);
|
||||
t = next_thread(t);
|
||||
} while (t != current);
|
||||
} while_each_thread(current, t);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user