Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 05:55:46 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix some recently introduced typos, build problems, and warnings

Browse Source
This commit is contained in:
Gregory Nutt
2014-10-05 16:58:52 -06:00
parent e8a2e3a506
commit 87eb1d47ed
4 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/src/common/up_vfork.c
+15
View File
@@ -239,8 +239,23 @@ pid_t up_vfork(const struct vfork_s *context)
{ {
child->cmn.xcp.syscall[index].sysreturn = child->cmn.xcp.syscall[index].sysreturn =
parent->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 = child->cmn.xcp.syscall[index].excreturn =
parent->xcp.syscall[index].excreturn; parent->xcp.syscall[index].excreturn;
#else
# error Missing logic
#endif
} }
child->cmn.xcp.nsyscalls = parent->xcp.nsyscalls; child->cmn.xcp.nsyscalls = parent->xcp.nsyscalls;
include/sys/syscall.h
+6 -6
View File
@@ -235,13 +235,13 @@
# define SYS_pread (__SYS_descriptors+4) # define SYS_pread (__SYS_descriptors+4)
# define SYS_pwrite (__SYS_descriptors+5) # define SYS_pwrite (__SYS_descriptors+5)
# ifdef CONFIG_FS_AIO # ifdef CONFIG_FS_AIO
# define SYS_aio_read (_SYS_descriptors+6) # define SYS_aio_read (__SYS_descriptors+6)
# define SYS_aio_write (_SYS_descriptors+7) # define SYS_aio_write (__SYS_descriptors+7)
# define SYS_aio_fsync (_SYS_descriptors+8) # define SYS_aio_fsync (__SYS_descriptors+8)
# define SYS_aio_cancel (_SYS_descriptors+9) # define SYS_aio_cancel (__SYS_descriptors+9)
# define __SYS_poll (_SYS_descriptors+10) # define __SYS_poll (__SYS_descriptors+10)
# else # else
# define __SYS_poll (_SYS_descriptors+6) # define __SYS_poll (__SYS_descriptors+6)
# endif # endif
# ifndef CONFIG_DISABLE_POLL # ifndef CONFIG_DISABLE_POLL
# define SYS_poll __SYS_poll # define SYS_poll __SYS_poll
sched/task/task_vfork.c
+2 -1
View File
@@ -41,9 +41,10 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include <assert.h> #include <assert.h>
#include <queue.h>
#include <errno.h> #include <errno.h>
#include <queue.h>
#include <debug.h> #include <debug.h>
#include <nuttx/sched.h> #include <nuttx/sched.h>
syscall/syscall_stublookup.c
+2 -2
View File
@@ -175,8 +175,8 @@ uintptr_t STUB_select(int nbr, uintptr_t parm1, uintptr_t parm2,
uintptr_t STUB_aio_read(int nbr, uintptr_t parm1); uintptr_t STUB_aio_read(int nbr, uintptr_t parm1);
uintptr_t STUB_aio_write(int nbr, uintptr_t parm1); uintptr_t STUB_aio_write(int nbr, uintptr_t parm1);
uintptr_t STUB_aio_fsync(int nbr, uintptr_t parm1, uintptr_t parm1); uintptr_t STUB_aio_fsync(int nbr, uintptr_t parm1, uintptr_t parm2);
uintptr_t STUB_aio_cancel(int nbr, uintptr_t parm1, uintptr_t parm1); uintptr_t STUB_aio_cancel(int nbr, uintptr_t parm1, uintptr_t parm2);
/* The following are defined if file descriptors are enabled */ /* The following are defined if file descriptors are enabled */