diff --git a/arch b/arch
index 0b8fe68bf5..7ce734b33c 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 0b8fe68bf5c15b49d7877c97516fdda542b2149b
+Subproject commit 7ce734b33cc3e0d85cf26e9d9bf409ed47004919
diff --git a/configs b/configs
index 0c764446fe..3783532d6d 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 0c764446fee7b6b4c6bb9c188042fb98b4d1e8eb
+Subproject commit 3783532d6d7f3d809c523b63a55d544d7e6e5c6c
diff --git a/include/nuttx/semaphore.h b/include/nuttx/semaphore.h
index bdb5cfb27f..4a5bb32d32 100644
--- a/include/nuttx/semaphore.h
+++ b/include/nuttx/semaphore.h
@@ -117,8 +117,10 @@ int sem_tickwait(FAR sem_t *sem, systime_t start, uint32_t delay);
  * Name: sem_reset
  *
  * Description:
- *   Reset a semaphore to a specific value.  This kind of operation is
- *   sometimes required for certain error handling conditions.
+ *   Reset a semaphore count to a specific value.  This is similar to part
+ *   of the operation of sem_init().  But sem_reset() may need to wake up
+ *   tasks waiting on a count.  This kind of operation is sometimes required
+ *   within the OS (only) for certain error handling conditions.
  *
  * Parameters:
  *   sem   - Semaphore descriptor to be reset
diff --git a/include/semaphore.h b/include/semaphore.h
index de4394c4e1..142ef51ada 100644
--- a/include/semaphore.h
+++ b/include/semaphore.h
@@ -85,7 +85,7 @@ struct semholder_s
 
 struct sem_s
 {
-  int16_t semcount;              /* >0 -> Num counts available */
+  volatile int16_t semcount;     /* >0 -> Num counts available */
                                  /* <0 -> Num tasks waiting for semaphore */
   /* If priority inheritance is enabled, then we have to keep track of which
    * tasks hold references to the semaphore.
diff --git a/sched/semaphore/sem_reset.c b/sched/semaphore/sem_reset.c
index 6db75887ab..4f98d4e8e3 100644
--- a/sched/semaphore/sem_reset.c
+++ b/sched/semaphore/sem_reset.c
@@ -55,8 +55,10 @@
  * Name: sem_reset
  *
  * Description:
- *   Reset a semaphore to a specific value.  This kind of operation is
- *   sometimes required for certain error handling conditions.
+ *   Reset a semaphore count to a specific value.  This is similar to part
+ *   of the operation of sem_init().  But sem_reset() may need to wake up
+ *   tasks waiting on a count.  This kind of operation is sometimes required
+ *   within the OS (only) for certain error handling conditions.
  *
  * Parameters:
  *   sem   - Semaphore descriptor to be reset
@@ -74,7 +76,7 @@ int sem_reset(FAR sem_t *sem, int16_t count)
   DEBUGASSERT(sem != NULL && count >= 0);
 
   /* Don't allow any context switches that may result from the following
-   * sem_post operations.
+   * sem_post() operations.
    */
 
   sched_lock();
@@ -85,7 +87,7 @@ int sem_reset(FAR sem_t *sem, int16_t count)
 
   flags = enter_critical_section();
 
-  /* A negative count indicates the negated number of threads that are
+  /* A negative count indicates that the negated number of threads are
    * waiting to take a count from the semaphore.  Loop here, handing
    * out counts to any waiting threads.
    */
@@ -105,7 +107,7 @@ int sem_reset(FAR sem_t *sem, int16_t count)
    * (i.e., with sem->semcount >= 0).  In this case, 'count' holds the
    * the new value of the semaphore count.  OR (2) with threads still
    * waiting but all of the semaphore counts exhausted:  The current
-   * value of sem->semcount is correct.
+   * value of sem->semcount is already correct in this case.
    */
 
   if (sem->semcount >= 0)