summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/armv7-m
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-15 00:27:26 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2013-03-15 00:27:26 +0000
commitf3fda28e68f1c84447c73fc2514aa63f0f97fed4 (patch)
tree1faa86680fb56b2660b3b3ede690152c8316b9dc /nuttx/arch/arm/src/armv7-m
parent256ff9a480238dfd1d30b7dfb3d61835991b3ee7 (diff)
downloadpx4-nuttx-f3fda28e68f1c84447c73fc2514aa63f0f97fed4.tar.gz
px4-nuttx-f3fda28e68f1c84447c73fc2514aa63f0f97fed4.tar.bz2
px4-nuttx-f3fda28e68f1c84447c73fc2514aa63f0f97fed4.zip
Fix a compile error introduced in last commit
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5743 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/armv7-m')
-rw-r--r--nuttx/arch/arm/src/armv7-m/up_initialstate.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/nuttx/arch/arm/src/armv7-m/up_initialstate.c b/nuttx/arch/arm/src/armv7-m/up_initialstate.c
index 41828af5b..091115fba 100644
--- a/nuttx/arch/arm/src/armv7-m/up_initialstate.c
+++ b/nuttx/arch/arm/src/armv7-m/up_initialstate.c
@@ -126,6 +126,7 @@ void up_initial_state(struct tcb_s *tcb)
#endif
#endif /* CONFIG_PIC */
+#if defined(CONFIG_ARMV7M_CMNVECTOR) || defined(CONFIG_NUTTX_KERNEL)
/* All tasks start via a stub function in kernel space. So all
* tasks must start in privileged thread mode. If CONFIG_NUTTX_KERNEL
* is defined, then that stub function will switch to unprivileged
@@ -134,6 +135,8 @@ void up_initial_state(struct tcb_s *tcb)
xcp->regs[REG_EXC_RETURN] = EXC_RETURN_PRIVTHR;
+#endif /* CONFIG_ARMV7M_CMNVECTOR || CONFIG_NUTTX_KERNEL */
+
#if defined(CONFIG_ARMV7M_CMNVECTOR) && defined(CONFIG_ARCH_FPU)
xcp->regs[REG_FPSCR] = 0; // XXX initial FPSCR should be configurable