diff --git a/arch/arm/src/common/up_vfork.c b/arch/arm/src/common/up_vfork.c
index df7e770c108..2c7f183f956 100644
--- a/arch/arm/src/common/up_vfork.c
+++ b/arch/arm/src/common/up_vfork.c
@@ -242,12 +242,13 @@ pid_t up_vfork(const struct vfork_s *context)
 
           /* REVISIT:  This logic is *not* common. */
 
-#if (defined(CONFIG_ARCH_CORTEXA5) || defined(CONFIG_ARCH_CORTEXA8)) && \
-     defined(CONFIG_BUILD_KERNEL)
+#if defined(CONFIG_ARCH_CORTEXA5) || defined(CONFIG_ARCH_CORTEXA8)
+#  ifdef CONFIG_BUILD_KERNEL
 
           child->cmn.xcp.syscall[index].cpsr =
             parent->xcp.syscall[index].cpsr;
 
+#  endif
 #elif defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4) || \
       defined(CONFIG_ARCH_CORTEXM0) || defined(CONFIG_ARCH_CORTEXM7)
 
diff --git a/configs b/configs
index c101e964ccd..92d94928d04 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit c101e964ccdfbaaae58aa6f156548d0277ad1fce
+Subproject commit 92d94928d040abacc0ecd05b7a1d81c41cd7f250