The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c974c22a4fd997729d7b4caadb05ae6658c50e08
commit c974c22a4fd997729d7b4caadb05ae6658c50e08 Author: Vladimir Kondratyev <[email protected]> AuthorDate: 2022-01-26 22:27:01 +0000 Commit: Vladimir Kondratyev <[email protected]> CommitDate: 2022-01-26 22:27:01 +0000 Revert "LinuxKPI: Allow wake_up to be executed within a critical section" This change was based on currently reverted commit 7dea0c9e6eba. This reverts commit 89889ab470b9f1a1cd36913dd219b78efbf484df. --- sys/compat/linuxkpi/common/src/linux_schedule.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_schedule.c b/sys/compat/linuxkpi/common/src/linux_schedule.c index 02074be8eb19..656d8697d169 100644 --- a/sys/compat/linuxkpi/common/src/linux_schedule.c +++ b/sys/compat/linuxkpi/common/src/linux_schedule.c @@ -202,11 +202,9 @@ void linux_wake_up(wait_queue_head_t *wqh, unsigned int state, int nr, bool locked) { wait_queue_t *pos, *next; - unsigned long flags; if (!locked) - spin_lock_irqsave(&wqh->lock, flags); - + spin_lock(&wqh->lock); list_for_each_entry_safe(pos, next, &wqh->task_list, task_list) { if (pos->func == NULL) { if (wake_up_task(pos->private, state) != 0 && --nr == 0) @@ -217,7 +215,7 @@ linux_wake_up(wait_queue_head_t *wqh, unsigned int state, int nr, bool locked) } } if (!locked) - spin_unlock_irqrestore(&wqh->lock, flags); + spin_unlock(&wqh->lock); } void
