diff --git a/ChangeLog b/ChangeLog
index 3a319bcbe34..5698374cb60 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11000,3 +11000,6 @@
 	  if there is a pending signal action before scheduling the next signal
 	  action.  Both the test and the scheduling action need to be atomic
 	  (2015-09-30).
+	* sched/wqueue/kwork_queue.c and libc/wqueue/work_queue.c: Logic that
+	  sets the queued indication and the logic that does the actual queuing
+	  must be atomic (2015-09-20).
diff --git a/arch b/arch
index 22e48d4266c..932831a0baf 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 22e48d4266c8c6a8d31aefabe375dcb78173975b
+Subproject commit 932831a0bafc09a0d62349ae97e9c0386f917957