summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-27 14:22:00 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-27 14:22:00 -0600
commit3bca5b16412b62536ce746774c4482871fae7852 (patch)
tree9d51ae1145f5718fa5491b1473feca60df6818f2
parenta573572c3eae44b191b98e4cbe543a23bba27233 (diff)
downloadnuttx-3bca5b16412b62536ce746774c4482871fae7852.tar.gz
nuttx-3bca5b16412b62536ce746774c4482871fae7852.tar.bz2
nuttx-3bca5b16412b62536ce746774c4482871fae7852.zip
Minor address environment clean-up. Cannot generate debug contexts in certain contexts
-rw-r--r--nuttx/arch/arm/src/armv7-a/arm_addrenv.c2
-rw-r--r--nuttx/sched/group/group_join.c4
-rw-r--r--nuttx/sched/pthread/pthread_release.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/armv7-a/arm_addrenv.c b/nuttx/arch/arm/src/armv7-a/arm_addrenv.c
index 83d4f3856..1d08d2ecb 100644
--- a/nuttx/arch/arm/src/armv7-a/arm_addrenv.c
+++ b/nuttx/arch/arm/src/armv7-a/arm_addrenv.c
@@ -524,7 +524,6 @@ int up_addrenv_select(FAR const group_addrenv_t *addrenv,
uintptr_t paddr;
int i;
- bvdbg("addrenv=%p oldenv=%p\n", addrenv, oldenv);
DEBUGASSERT(addrenv);
for (vaddr = CONFIG_ARCH_TEXT_VBASE, i = 0;
@@ -682,7 +681,6 @@ int up_addrenv_coherent(FAR const group_addrenv_t *addrenv)
uintptr_t vaddr;
int i;
- bvdbg("addrenv=%p\n", addrenv);
DEBUGASSERT(addrenv);
/* Invalidate I-Cache */
diff --git a/nuttx/sched/group/group_join.c b/nuttx/sched/group/group_join.c
index 301d4481d..810bfcc01 100644
--- a/nuttx/sched/group/group_join.c
+++ b/nuttx/sched/group/group_join.c
@@ -152,7 +152,7 @@ static inline int group_addmember(FAR struct task_group_s *group, pid_t pid)
* A thread joins the group when it is created. This is a two step process,
* first, the group must bound to the new threads TCB. group_bind() does
* this (at the return from group_join, things are a little unstable: The
- * group has been bound, but tg_nmembers hs not yet been incremented).
+ * group has been bound, but tg_nmembers has not yet been incremented).
* Then, after the new thread is initialized and has a PID assigned to it,
* group_join() is called, incrementing the tg_nmembers count on the group.
*
@@ -189,7 +189,7 @@ int group_bind(FAR struct pthread_tcb_s *tcb)
* A thread joins the group when it is created. This is a two step process,
* first, the group must bound to the new threads TCB. group_bind() does
* this (at the return from group_join, things are a little unstable: The
- * group has been bound, but tg_nmembers hs not yet been incremented).
+ * group has been bound, but tg_nmembers has not yet been incremented).
* Then, after the new thread is initialized and has a PID assigned to it,
* group_join() is called, incrementing the tg_nmembers count on the group.
*
diff --git a/nuttx/sched/pthread/pthread_release.c b/nuttx/sched/pthread/pthread_release.c
index d7d543b6a..b7b5dcaa1 100644
--- a/nuttx/sched/pthread/pthread_release.c
+++ b/nuttx/sched/pthread/pthread_release.c
@@ -93,8 +93,7 @@
void pthread_release(FAR struct task_group_s *group)
{
FAR struct join_s *join;
-
- sdbg("group=0x%p\n", group);
+ DEBUGASSERT(group);
/* Visit and delete each join structure still in the list. Since we
* are last exiting thread of the group, no special protection should