diff --git a/ChangeLog b/ChangeLog
index a994b05c15..78892f8035 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11483,4 +11483,7 @@
 	* sched/sched.h and other files:  Replace the bool 'prioritized' in the task
 	  list table with a uint8_t bit set so that additional attributes of a task
 	  list can be provided without adding more booleans (2016-10-11).
+	* Everywhere: Replace irqsave() with enter_critical_section(); replace
+	  irqrestore() with leave_critical_section().  This is part of the onging
+	  development of SMP support (2016-02-13).
 
diff --git a/arch b/arch
index 4abb852339..354df5c0f3 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 4abb8523390cecded97fe325448213983e47aedf
+Subproject commit 354df5c0f3f7e0f4df605a85edef7d8e170843c1
diff --git a/configs b/configs
index f9d09bf8c0..cfbc3f7c3e 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit f9d09bf8c091cc2d8578ae572ad8f48bb93d062a
+Subproject commit cfbc3f7c3e07bf07b012e42933f3fea7c2397d52