diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-07 14:27:47 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-07 14:27:47 +0000 |
| commit | 24151ccd83ce2d0d75bb9c45b137215c24c821c3 (patch) | |
| tree | d9adb44a8128e7f408bbd16450f40f80da9e0e92 /nuttx/arch/arm/src/armv7-m/up_svcall.c | |
| parent | ce376ed9e145fe7b9c0215e93bfebf0893ecf7b3 (diff) | |
| download | px4-nuttx-24151ccd83ce2d0d75bb9c45b137215c24c821c3.tar.gz px4-nuttx-24151ccd83ce2d0d75bb9c45b137215c24c821c3.tar.bz2 px4-nuttx-24151ccd83ce2d0d75bb9c45b137215c24c821c3.zip | |
More kernel build fixes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5716 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/armv7-m/up_svcall.c')
| -rw-r--r-- | nuttx/arch/arm/src/armv7-m/up_svcall.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/armv7-m/up_svcall.c b/nuttx/arch/arm/src/armv7-m/up_svcall.c index 4da466934..5b56797a9 100644 --- a/nuttx/arch/arm/src/armv7-m/up_svcall.c +++ b/nuttx/arch/arm/src/armv7-m/up_svcall.c @@ -250,7 +250,7 @@ int up_svcall(int irq, FAR void *context) * that there is a saved syscall return address. */ - DEBUGASSERT(rtcb->xcp.sysreturn != NULL && + DEBUGASSERT(rtcb->xcp.sysreturn != 0 && regs[REG_EXC_RETURN] == EXC_RETURN_PRIVTHR); /* Setup to return to the saved syscall return address in @@ -259,7 +259,7 @@ int up_svcall(int irq, FAR void *context) current_regs[REG_PC] = rtcb->xcp.sysreturn; current_regs[REG_EXC_RETURN] = EXC_RETURN_UNPRIVTHR; - rtcb->xcp.sysreturn = NULL; + rtcb->xcp.sysreturn = 0; /* The return value must be in R0-R1. dispatch_syscall() temporarily * moved the value to R2. @@ -288,7 +288,7 @@ int up_svcall(int irq, FAR void *context) * there is a no saved syscall return address. */ - DEBUGASSERT(rtcb->xcp.sysreturn == NULL && + DEBUGASSERT(rtcb->xcp.sysreturn == 0 && regs[REG_EXC_RETURN] == EXC_RETURN_UNPRIVTHR); /* Setup to return to dispatch_syscall in privileged mode. */ |