From e79d6e3c8bdc6440f5b2a33468ad65689e690597 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 22 Aug 2014 15:55:00 -0600
Subject: [PATCH] A few fixes for compilation errors due to recent address
 environment fixes

---
 arch/z80/src/z180/z180_mmu.c   | 3 +--
 binfmt/binfmt_execmodule.c     | 2 +-
 configs/p112/README.txt        | 4 +++-
 include/nuttx/arch.h           | 3 +--
 include/nuttx/sched.h          | 2 ++
 sched/pthread/pthread_create.c | 4 ++--
 sched/sched/sched_releasetcb.c | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/arch/z80/src/z180/z180_mmu.c b/arch/z80/src/z180/z180_mmu.c
index c54fda1482..c4ed03aa43 100644
--- a/arch/z80/src/z180/z180_mmu.c
+++ b/arch/z80/src/z180/z180_mmu.c
@@ -498,8 +498,7 @@ int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb)
  *
  ****************************************************************************/
 
-int up_addrenv_detach(FAR struct task_group_s *group,
-                      FAR struct task_group_s *tcb);
+int up_addrenv_detach(FAR struct task_group_s *group, FAR struct tcb_s *tcb);
 {
   /* There is nothing that needs to be done */
 
diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c
index c765724bd7..aff45d7ec2 100644
--- a/binfmt/binfmt_execmodule.c
+++ b/binfmt/binfmt_execmodule.c
@@ -208,7 +208,7 @@ int exec_module(FAR const struct binary_s *binp)
   /* Assign the address environment to the new task group */
 
 #ifdef CONFIG_ADDRENV
-  ret = up_addrenv_assign(binp->addrenv, tcb->group);
+  ret = up_addrenv_assign(binp->addrenv, tcb->cmn.group);
   if (ret < 0)
     {
       err = -ret;
diff --git a/configs/p112/README.txt b/configs/p112/README.txt
index 27dcf6727b..6e427bbe03 100644
--- a/configs/p112/README.txt
+++ b/configs/p112/README.txt
@@ -144,4 +144,6 @@ stopper" before I gave up for now was during building dependencies:
 ASlink-Error-<cannot open> : "bin/mm_initialize.rel"
 
 Clearly there is something wrong with the command line options given to SDCC because it is
-trying to compile and link when we really only want dependencies.
+trying to compile and link when we really only want dependencies.  I did not spend very much
+time trying to solve the problem; I assume that it is not too difficult.
+
diff --git a/include/nuttx/arch.h b/include/nuttx/arch.h
index b1e972be54..176d590956 100644
--- a/include/nuttx/arch.h
+++ b/include/nuttx/arch.h
@@ -879,8 +879,7 @@ int up_addrenv_attach(FAR struct task_group_s *group, FAR struct tcb_s *tcb);
  ****************************************************************************/
 
 #ifdef CONFIG_ADDRENV
-int up_addrenv_detach(FAR struct task_group_s *group,
-                      FAR struct task_group_s *tcb);
+int up_addrenv_detach(FAR struct task_group_s *group, FAR struct tcb_s *tcb);
 #endif
 
 /****************************************************************************
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index 5ef5337fca..9e9889828a 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -55,6 +55,8 @@
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/net.h>
 
+#include <arch/arch.h>
+
 /********************************************************************************
  * Pre-processor Definitions
  ********************************************************************************/
diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c
index 85ec3c5d8c..c287bd54a8 100644
--- a/sched/pthread/pthread_create.c
+++ b/sched/pthread/pthread_create.c
@@ -270,8 +270,8 @@ int pthread_create(FAR pthread_t *thread, FAR pthread_attr_t *attr,
 #ifdef CONFIG_ADDRENV
   /* Share the address environment of the parent task group. */
 
-  ret = up_addrenv_attach(ptcb->group,
-                          (FAR const struct tcb_s *)g_readytorun.head);
+  ret = up_addrenv_attach(ptcb->cmn.group,
+                          (FAR struct tcb_s *)g_readytorun.head);
   if (ret < 0)
     {
       errcode = -ret;
diff --git a/sched/sched/sched_releasetcb.c b/sched/sched/sched_releasetcb.c
index 3899911f3f..13e0446c14 100644
--- a/sched/sched/sched_releasetcb.c
+++ b/sched/sched/sched_releasetcb.c
@@ -193,7 +193,7 @@ int sched_releasetcb(FAR struct tcb_s *tcb, uint8_t ttype)
       /* Release this thread's reference to the address environment */
 
 #ifdef CONFIG_ADDRENV
-      ret = up_addrenv_detach(tcp->group, tcb);
+      ret = up_addrenv_detach(tcb->group, tcb);
 #endif
 
       /* Leave the group (if we did not already leave in task_exithook.c) */