From 32e41423e409a43bc2fe8eae58abafab87d14c39 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Wed, 1 Jul 2015 08:34:51 -0600 Subject: [PATCH] Fix a Cortex-A compilation error in the vfork() logic when system calls are enabled in modes other than CONFIG_BUILD_KERNEL. --- arch/arm/src/common/up_vfork.c | 5 +++-- configs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/common/up_vfork.c b/arch/arm/src/common/up_vfork.c index df7e770c10..2c7f183f95 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 c101e964cc..92d94928d0 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit c101e964ccdfbaaae58aa6f156548d0277ad1fce +Subproject commit 92d94928d040abacc0ecd05b7a1d81c41cd7f250