summaryrefslogtreecommitdiffstats
path: root/nuttx/arch/arm/src/common
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-22 18:14:18 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-22 18:14:18 +0000
commit3831c45419903e2e4263cac59d3cfcea2998b456 (patch)
tree73105f0c26928d4c6992417ea780daa36c439549 /nuttx/arch/arm/src/common
parent5178f655dc0eae14efa489f0064406568136d603 (diff)
Incoporate new ARMv7-M exception handling logic contributed by Mike Smith
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4413 7fd9a85b-ad96-42d3-883c-3090e2eb8679
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 79dc3f7d9c..f0f3d06ef9 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); \