summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/common
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-22 18:14:18 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-02-22 18:14:18 +0000
commitdfb6261f45bb4a34b3fdfc10047c908534e0bee5 (patch)
tree73105f0c26928d4c6992417ea780daa36c439549 /nuttx/arch/arm/src/common
parent6e7deb2a77bcd3159a47328699e2c489238931b0 (diff)
downloadpx4-nuttx-dfb6261f45bb4a34b3fdfc10047c908534e0bee5.tar.gz
px4-nuttx-dfb6261f45bb4a34b3fdfc10047c908534e0bee5.tar.bz2
px4-nuttx-dfb6261f45bb4a34b3fdfc10047c908534e0bee5.zip
Incoporate new ARMv7-M exception handling logic contributed by Mike Smith
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4413 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/common')
-rw-r--r--nuttx/arch/arm/src/common/up_internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/common/up_internal.h b/nuttx/arch/arm/src/common/up_internal.h
index 79dc3f7d9..f0f3d06ef 100644
--- a/nuttx/arch/arm/src/common/up_internal.h
+++ b/nuttx/arch/arm/src/common/up_internal.h
@@ -100,7 +100,7 @@
*/
#if defined(CONFIG_ARCH_CORTEXM3) || defined(CONFIG_ARCH_CORTEXM4)
-# ifdef CONFIG_ARCH_FPU
+# if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_ARMV7M_CMNVECTOR)
# define up_savestate(regs) \
do { \
up_copystate(regs, (uint32_t*)current_regs); \