diff options
| author | Mitchell Horne <mhorne@FreeBSD.org> | 2023-11-23 15:27:57 +0000 |
|---|---|---|
| committer | Mitchell Horne <mhorne@FreeBSD.org> | 2023-12-08 22:02:45 +0000 |
| commit | 08b952c56b5e69d752a8a4bf42ff16f666c3eb5d (patch) | |
| tree | d94b500eceb8bf582a83136e0905816a0e523435 | |
| parent | 121656c2b12ffb0a00085a4d320f2b38b7a7bd3d (diff) | |
| download | src-08b952c56b5e69d752a8a4bf42ff16f666c3eb5d.tar.gz src-08b952c56b5e69d752a8a4bf42ff16f666c3eb5d.zip | |
shutdown: tweak kproc/kthread shutdown check
This is to handle the case where the system has not panicked but the
debugger is active, where we still can't wait for thread termination.
Reviewed by: markj
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D42683
(cherry picked from commit 960612a19f009df602a4cb008fa90a45a6e869bb)
| -rw-r--r-- | sys/kern/kern_shutdown.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index 19920d30357f..b69caebe17d9 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -1011,7 +1011,7 @@ kproc_shutdown(void *arg, int howto) struct proc *p; int error; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; p = (struct proc *)arg; @@ -1031,7 +1031,7 @@ kthread_shutdown(void *arg, int howto) struct thread *td; int error; - if (KERNEL_PANICKED()) + if (SCHEDULER_STOPPED()) return; td = (struct thread *)arg; |