diff --git a/ChangeLog b/ChangeLog
index 4db1c92df0..e8792ba888 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1654,7 +1654,7 @@
 	* arch/*/include/*/type.h: On some compilers, char defaults as unsigned.
 	  Explicitly add signed to integer types if signed is what is required.
 	* arch/*: For all architectures -- Global register state save structure
-	  (usually called current_regs) should be marked volatile; Added general
+	  (usually called g_current_regs) should be marked volatile; Added general
 	  capability to support nested interrupts (not fully realized for all
 	  architectures).
 	* sched/task_create.c: Add support for starting kernel-mode thread.
diff --git a/TODO b/TODO
index 9bf3e7ede3..d9c66df017 100644
--- a/TODO
+++ b/TODO
@@ -1679,7 +1679,7 @@ o ARM (arch/arm/)
   Title:       IMPROVED ARM INTERRUPT HANDLING
   Description: ARM interrupt handling performance could be improved in some
                ways. One easy way is to use a pointer to the context save
-               area in current_regs instead of using up_copystate so much.
+               area in g_current_regs instead of using up_copystate so much.
 
                This approach is already implemented for the ARM Cortex-M0,
                Cortex-M3, Cortex-M4, and Cortex-A5 families.  But still needs
diff --git a/arch b/arch
index 9a31f264ec..0dfea1d68b 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 9a31f264ec72f07d40fb3b79f77ca72869ca8eee
+Subproject commit 0dfea1d68b55f7d8378d422eb4875acc59867077
diff --git a/configs b/configs
index 82e6f02229..d43a9495be 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 82e6f022294752fcbdd71e282c493eba20751732
+Subproject commit d43a9495be59baeae4e8626c3138cc7e792e3af1