From 5d9276ed7194e7645af47a91b6a9450f05d50e20 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 16 Sep 2014 15:55:21 -0600
Subject: [PATCH] More changes so that the KNSH build survives the changes
 needed for the ELF build

---
 mm/Makefile              | 6 +++---
 mm/umm_sbrk.c            | 4 ++--
 sched/task/task_create.c | 4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/mm/Makefile b/mm/Makefile
index 4c5fe0e197..03331ebd9c 100644
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -56,7 +56,7 @@ CSRCS += mm_shrinkchunk.c
 CSRCS += mm_brkaddr.c mm_calloc.c mm_extend.c mm_free.c mm_mallinfo.c
 CSRCS += mm_malloc.c mm_memalign.c mm_realloc.c mm_zalloc.c
 
-ifeq ($(CONFIG_ARCH_ADDRENV),y)
+ifeq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += mm_sbrk.c
 endif
 
@@ -66,7 +66,7 @@ CSRCS += umm_initialize.c umm_addregion.c umm_sem.c
 CSRCS += umm_brkaddr.c umm_calloc.c umm_extend.c umm_free.c umm_mallinfo.c
 CSRCS += umm_malloc.c umm_memalign.c umm_realloc.c umm_zalloc.c
 
-ifeq ($(CONFIG_ARCH_ADDRENV),y)
+ifeq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += umm_sbrk.c
 endif
 
@@ -77,7 +77,7 @@ CSRCS += kmm_initialize.c kmm_addregion.c kmm_sem.c
 CSRCS += kmm_brkaddr.c kmm_calloc.c kmm_extend.c kmm_free.c kmm_mallinfo.c
 CSRCS += kmm_malloc.c kmm_memalign.c kmm_realloc.c kmm_zalloc.c
 
-ifeq ($(CONFIG_ARCH_ADDRENV),y)
+ifeq ($(CONFIG_BUILD_KERNEL),y)
 CSRCS += kmm_sbrk.c
 endif
 
diff --git a/mm/umm_sbrk.c b/mm/umm_sbrk.c
index 1e6eaf5c37..9eff1a4b6c 100644
--- a/mm/umm_sbrk.c
+++ b/mm/umm_sbrk.c
@@ -45,7 +45,7 @@
 #include <nuttx/addrenv.h>
 #include <nuttx/pgalloc.h>
 
-#if defined(CONFIG_BUILD_KERNEL) && !defined(__KERNEL__)
+#if defined(CONFIG_BUILD_KERNEL)
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -101,4 +101,4 @@ FAR void *sbrk(intptr_t incr)
   return mm_sbrk(USR_HEAP, incr, CONFIG_ARCH_HEAP_NPAGES << MM_PGSHIFT);
 }
 
-#endif /* CONFIG_BUILD_KERNEL && !__KERNEL__ */
+#endif /* CONFIG_BUILD_KERNEL */
diff --git a/sched/task/task_create.c b/sched/task/task_create.c
index 32b1211642..351b3ddc04 100644
--- a/sched/task/task_create.c
+++ b/sched/task/task_create.c
@@ -52,8 +52,6 @@
 #include "group/group.h"
 #include "task/task.h"
 
-#ifndef CONFIG_BUILD_KERNEL
-
 /****************************************************************************
  * Preprocessor Definitions
  ****************************************************************************/
@@ -271,5 +269,3 @@ int kernel_thread(FAR const char *name, int priority,
 {
   return thread_create(name, TCB_FLAG_TTYPE_KERNEL, priority, stack_size, entry, argv);
 }
-
-#endif /* CONFIG_BUILD_KERNEL */