optim struct for code.

mkrtos_knl/inc/knl/vma.h

@@ -2,7 +2,7 @@
 #include <types.h>
 #include <util.h>
 #include <arch.h>
-#include <rbtree_mm.h>
+#include <mmu/rbtree_mm.h>
 
 enum vpage_prot_attrs
 {

mkrtos_knl/knl/CMakeLists.txt

@@ -29,7 +29,8 @@ endif()
 if (DEFINED CONFIG_MMU)
     if (CONFIG_MMU STREQUAL "y")
         file(GLOB mm_src mm/*.c mm/*.S)
-        list(APPEND deps ${mm_src})
+        file(GLOB mm_mmu_src mm/mmu/*.c mm/mmu/*.S)
+        list(APPEND deps ${mm_src} ${mm_mmu_src})
     endif()
 endif()
 
@@ -47,4 +48,5 @@ target_include_directories(
     ${CMAKE_SOURCE_DIR}/mkrtos_knl/inc/drv
 
     ${CMAKE_SOURCE_DIR}/mkrtos_knl/knl/mm
+    ${CMAKE_SOURCE_DIR}/mkrtos_knl/knl/mm/mmu
 )

mkrtos_knl/knl/mm/mmu/rbtree_mm.h

@@ -1,5 +1,5 @@
 #pragma once
 
-#include <mln_rbtree.h>
+#include "mln_rbtree.h"
 
 void rbtree_mm_init(mln_rbtree_t *root_rbtree);

mkrtos_knl/knl/task.c

@@ -365,6 +365,7 @@ static void task_release_stage2(kobject_t *kobj)
 
     obj_space_release(&tk->obj_space, tk->lim);
 
+#if !IS_ENABLED(CONFIG_MMU)
     if (tk->mm_space.mm_block) {
 #if CONFIG_MK_MPU_CFG
         mm_limit_free_align(tk->lim, tk->mm_space.mm_block, tk->mm_space.mm_block_size);
@@ -372,6 +373,7 @@ static void task_release_stage2(kobject_t *kobj)
         mm_limit_free(tk->lim, tk->mm_space.mm_block);
 #endif
     }
+#endif
 #if IS_ENABLED(CONFIG_BUDDY_SLAB)
     mm_limit_free_slab(task_slab, tk->lim, tk);
 #else