diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-06 19:56:32 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-06 19:56:32 +0000 |
| commit | 7c2ea5a1a560284b6d22a60d62ac943ec6144096 (patch) | |
| tree | 8d1191e3b5fe5cb9f0fe1319d45648d859060cae /nuttx/arch/arm/include/armv6-m | |
| parent | 9e9de3d19ebf1890bfccd0bf63fa0209e2ec9359 (diff) | |
| download | px4-nuttx-7c2ea5a1a560284b6d22a60d62ac943ec6144096.tar.gz px4-nuttx-7c2ea5a1a560284b6d22a60d62ac943ec6144096.tar.bz2 px4-nuttx-7c2ea5a1a560284b6d22a60d62ac943ec6144096.zip | |
Fix some bad syscall dispatching log. This change is not testable until these is a tested NuttX kernel build.
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5713 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/include/armv6-m')
| -rw-r--r-- | nuttx/arch/arm/include/armv6-m/irq.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nuttx/arch/arm/include/armv6-m/irq.h b/nuttx/arch/arm/include/armv6-m/irq.h index 68f8c75d4..f4bfea33f 100644 --- a/nuttx/arch/arm/include/armv6-m/irq.h +++ b/nuttx/arch/arm/include/armv6-m/irq.h @@ -147,11 +147,11 @@ #ifndef __ASSEMBLY__ struct xcptcontext { +#ifndef CONFIG_DISABLE_SIGNALS /* The following function pointer is non-zero if there * are pending signals to be processed. */ -#ifndef CONFIG_DISABLE_SIGNALS void *sigdeliver; /* Actual type is sig_deliver_t */ /* These are saved copies of LR, PRIMASK, and xPSR used during @@ -163,6 +163,12 @@ struct xcptcontext uint32_t saved_xpsr; #endif +#ifdef CONFIG_NUTTX_KERNEL + /* The following holds the return address from a system call */ + + uint32_t sysreturn; +#endif + /* Register save area */ uint32_t regs[XCPTCONTEXT_REGS]; |