diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-05 16:58:52 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-05 16:58:52 -0600 |
| commit | 35330f6c7500f521280ec5c864d65164bbbc2ea5 (patch) | |
| tree | 0e0c3b92fd0a9f3c088221b4cddeb67d283ba6c5 /nuttx/arch/arm/src/common | |
| parent | 37c80524e1e71319444a4da69931db88cf07a253 (diff) | |
| download | nuttx-35330f6c7500f521280ec5c864d65164bbbc2ea5.tar.gz nuttx-35330f6c7500f521280ec5c864d65164bbbc2ea5.tar.bz2 nuttx-35330f6c7500f521280ec5c864d65164bbbc2ea5.zip | |
Fix some recently introduced typos, build problems, and warnings
Diffstat (limited to 'nuttx/arch/arm/src/common')
| -rw-r--r-- | nuttx/arch/arm/src/common/up_vfork.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/nuttx/arch/arm/src/common/up_vfork.c b/nuttx/arch/arm/src/common/up_vfork.c index a11c3b94f..801ac1f67 100644 --- a/nuttx/arch/arm/src/common/up_vfork.c +++ b/nuttx/arch/arm/src/common/up_vfork.c @@ -239,8 +239,23 @@ pid_t up_vfork(const struct vfork_s *context) { child->cmn.xcp.syscall[index].sysreturn = parent->xcp.syscall[index].sysreturn; + + /* REVISIT: This logic is *not* common. */ + +#if (defined(CONFIG_ARCH_CORTEXA5) || defined(CONFIG_ARCH_CORTEXA8)) && \ + defined(CONFIG_BUILD_KERNEL) + + child->cmn.xcp.syscall[index].cpsr = + parent->xcp.syscall[index].cpsr; + +#elif defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4) || \ + defined(CONFIG_ARCH_CORTEXM0) + child->cmn.xcp.syscall[index].excreturn = parent->xcp.syscall[index].excreturn; +#else +# error Missing logic +#endif } child->cmn.xcp.nsyscalls = parent->xcp.nsyscalls; |