diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-12 08:04:27 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-12 08:04:27 -0600 |
| commit | de19ad5f0c7bfba50bde0136c4dd8037b72859f1 (patch) | |
| tree | b0c0c317682c3a1474a484340b6eb2ad433ed4be /nuttx/configs/sama5d4-ek/knsh | |
| parent | 30dc5ca366058b3004dd42900e6b11c3f8c84634 (diff) | |
| download | px4-nuttx-de19ad5f0c7bfba50bde0136c4dd8037b72859f1.tar.gz px4-nuttx-de19ad5f0c7bfba50bde0136c4dd8037b72859f1.tar.bz2 px4-nuttx-de19ad5f0c7bfba50bde0136c4dd8037b72859f1.zip | |
ARMv7-A: Modify up_fullcontextrestore() for CONFIG_BUILD_KERNEL. It changed CPSR while in kernel. That will crash is the new CPSR is user mode while executing in kernel space. Fixed by adding a SYS_context_restore system call. There is an alternative, simpler modification to up_fullcontextrestore() that could have been done: It might have been possible to use the SPSR instead of the CPRSR and then do an exception return from up_fullcontextrestore(). That would be more efficient, but I never tried it.
Diffstat (limited to 'nuttx/configs/sama5d4-ek/knsh')
| -rw-r--r-- | nuttx/configs/sama5d4-ek/knsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/knsh/defconfig.ROMFS | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nuttx/configs/sama5d4-ek/knsh/defconfig b/nuttx/configs/sama5d4-ek/knsh/defconfig index 37daf0d0c..6c933b367 100644 --- a/nuttx/configs/sama5d4-ek/knsh/defconfig +++ b/nuttx/configs/sama5d4-ek/knsh/defconfig @@ -455,7 +455,7 @@ CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_LIB_SYSCALL=y -CONFIG_SYS_RESERVED=5 +CONFIG_SYS_RESERVED=6 CONFIG_SYS_NNEST=2 # diff --git a/nuttx/configs/sama5d4-ek/knsh/defconfig.ROMFS b/nuttx/configs/sama5d4-ek/knsh/defconfig.ROMFS index d52473f33..0252ea21c 100644 --- a/nuttx/configs/sama5d4-ek/knsh/defconfig.ROMFS +++ b/nuttx/configs/sama5d4-ek/knsh/defconfig.ROMFS @@ -438,7 +438,7 @@ CONFIG_USERMAIN_STACKSIZE=2048 CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_DEFAULT=2048 CONFIG_LIB_SYSCALL=y -CONFIG_SYS_RESERVED=5 +CONFIG_SYS_RESERVED=6 CONFIG_SYS_NNEST=2 # |