Changeset eebecdc in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2025-03-13T18:30:36Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e3e53cc

Parents:

e494d7b (diff), da54714 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge upstream/master into helenraid

File:

• kernel/generic/src/proc/thread.c (modified) (2 diffs)

kernel/generic/src/proc/thread.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2025 Jiri Svoboda
  * Copyright (c) 2010 Jakub Jermar
- * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -338 +338 @@
         irq_spinlock_unlock(&thread->task->lock, false);
 
-        assert((atomic_get_unordered(&thread->state) == Exiting) || (atomic_get_unordered(&thread->state) == Lingering));
+        assert((atomic_get_unordered(&thread->state) == Entering) ||
+            (atomic_get_unordered(&thread->state) == Exiting) ||
+            (atomic_get_unordered(&thread->state) == Lingering));
 
         /* Clear cpu->fpu_owner if set to this thread. */