AT91SAM3 now supports kernel-mode heap; SAM3U-EK knsh configuration converted to use kconfig-frontends tool

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5726 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 11 insertions, 5 deletions

diff --git a/nuttx/mm/mm_kernel.c b/nuttx/mm/mm_kernel.c
index ff88bf0cc..0cf592e0a 100644
--- a/nuttx/mm/mm_kernel.c
+++ b/nuttx/mm/mm_kernel.c
@@ -38,6 +38,9 @@
  ************************************************************************/
 
 #include <nuttx/config.h>
+
+#include <assert.h>
+
 #include <nuttx/kmalloc.h>
 
 #if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) && defined(__KERNEL__)
diff --git a/nuttx/mm/mm_kerneluser.c b/nuttx/mm/mm_kerneluser.c
index da1f2716e..618b9f190 100644
--- a/nuttx/mm/mm_kerneluser.c
+++ b/nuttx/mm/mm_kerneluser.c
@@ -38,6 +38,9 @@
  ************************************************************************/
 
 #include <nuttx/config.h>
+
+#include <assert.h>
+
 #include <nuttx/kmalloc.h>
 
 #if defined(CONFIG_NUTTX_KERNEL) && defined(__KERNEL__)
@@ -245,7 +248,7 @@ FAR void *kurealloc(FAR void *oldmem, size_t newsize)
 
 void kufree(FAR void *mem)
 {
-#ifdef CONFIG_MM_KERNEL_HEAP
+#if defined(CONFIG_MM_KERNEL_HEAP) && defined(CONFIG_DEBUG)
   DEBUGASSERT(!kmm_heapmember(mem));
 #endif
   return KFREE(mem);
diff --git a/nuttx/mm/mm_realloc.c b/nuttx/mm/mm_realloc.c
index 4b5a479b4..f20bbb255 100644
--- a/nuttx/mm/mm_realloc.c
+++ b/nuttx/mm/mm_realloc.c
@@ -95,14 +95,14 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
 
   if (!oldmem)
     {
-      return malloc(size);
+      return mm_malloc(heap, size);
     }
 
   /* If size is zero, then realloc is equivalent to free */
 
   if (size <= 0)
     {
-      free(oldmem);
+      mm_free(heap, oldmem);
       return NULL;
     }
 
@@ -348,11 +348,11 @@ FAR void *mm_realloc(FAR struct mm_heap_s *heap, FAR void *oldmem,
        */
 
       mm_givesemaphore(heap);
-      newmem = (FAR void*)malloc(size);
+      newmem = (FAR void*)mm_malloc(heap, size);
       if (newmem)
         {
           memcpy(newmem, oldmem, oldsize);
-          free(oldmem);
+          mm_free(heap, oldmem);
         }
 
       return newmem;