This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit c7e60dead3e3adbb9bebfcd038d00b7d03f4e0ca Author: Bowen Wang <[email protected]> AuthorDate: Mon Aug 4 21:47:06 2025 +0800 mm/kmm_heap: add KNR_HEAP and replace all g_kmmheap to KNR_HEAP KNR_HEAP names the heap that kernel code allocates from: g_kmmheap when CONFIG_MM_KERNEL_HEAP is enabled, otherwise the user heap. Use it in kmm_heap so the kernel allocator and later users such as mempool share one definition. Signed-off-by: Bowen Wang <[email protected]> --- arch/ceva/src/common/ceva_heap.c | 2 +- include/nuttx/mm/mm.h | 2 ++ mm/kmm_heap/kmm_addregion.c | 2 +- mm/kmm_heap/kmm_brkaddr.c | 2 +- mm/kmm_heap/kmm_calloc.c | 2 +- mm/kmm_heap/kmm_checkcorruption.c | 2 +- mm/kmm_heap/kmm_extend.c | 2 +- mm/kmm_heap/kmm_free.c | 2 +- mm/kmm_heap/kmm_heapmember.c | 2 +- mm/kmm_heap/kmm_mallinfo.c | 4 ++-- mm/kmm_heap/kmm_malloc.c | 2 +- mm/kmm_heap/kmm_malloc_size.c | 2 +- mm/kmm_heap/kmm_memalign.c | 2 +- mm/kmm_heap/kmm_memdump.c | 2 +- mm/kmm_heap/kmm_realloc.c | 2 +- mm/kmm_heap/kmm_zalloc.c | 2 +- 16 files changed, 18 insertions(+), 16 deletions(-) diff --git a/arch/ceva/src/common/ceva_heap.c b/arch/ceva/src/common/ceva_heap.c index 7101d816e0c..633ec41af7b 100644 --- a/arch/ceva/src/common/ceva_heap.c +++ b/arch/ceva/src/common/ceva_heap.c @@ -40,7 +40,7 @@ ****************************************************************************/ #ifdef CONFIG_MM_KERNEL_HEAP -# define MM_DEF_HEAP &g_kmmheap +# define MM_DEF_HEAP &KNR_HEAP #else # define MM_DEF_HEAP &g_mmheap #endif diff --git a/include/nuttx/mm/mm.h b/include/nuttx/mm/mm.h index 2c66e55a83b..02999ee8aac 100644 --- a/include/nuttx/mm/mm.h +++ b/include/nuttx/mm/mm.h @@ -142,12 +142,14 @@ */ #ifdef CONFIG_MM_KERNEL_HEAP +# define KNR_HEAP g_kmmheap # if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL) # define MM_INTERNAL_HEAP(heap) ((heap) == g_kmmheap) # else # define MM_INTERNAL_HEAP(heap) ((heap) == USR_HEAP || (heap) == g_kmmheap) # endif #else +# define KNR_HEAP USR_HEAP # if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_BUILD_KERNEL) # define MM_INTERNAL_HEAP(heap) 0 # else diff --git a/mm/kmm_heap/kmm_addregion.c b/mm/kmm_heap/kmm_addregion.c index ece671d83b7..4976e9fab7a 100644 --- a/mm/kmm_heap/kmm_addregion.c +++ b/mm/kmm_heap/kmm_addregion.c @@ -51,7 +51,7 @@ void kmm_addregion(FAR void *heap_start, size_t heap_size) { - mm_addregion(g_kmmheap, heap_start, heap_size); + mm_addregion(KNR_HEAP, heap_start, heap_size); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_brkaddr.c b/mm/kmm_heap/kmm_brkaddr.c index 36c06316626..7a6353480d9 100644 --- a/mm/kmm_heap/kmm_brkaddr.c +++ b/mm/kmm_heap/kmm_brkaddr.c @@ -46,7 +46,7 @@ FAR void *kmm_brkaddr(int region) { - return mm_brkaddr(g_kmmheap, region); + return mm_brkaddr(KNR_HEAP, region); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_calloc.c b/mm/kmm_heap/kmm_calloc.c index c584840f96c..662be46d3a0 100644 --- a/mm/kmm_heap/kmm_calloc.c +++ b/mm/kmm_heap/kmm_calloc.c @@ -44,7 +44,7 @@ FAR void *kmm_calloc(size_t n, size_t elem_size) { - return mm_calloc(g_kmmheap, n, elem_size); + return mm_calloc(KNR_HEAP, n, elem_size); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_checkcorruption.c b/mm/kmm_heap/kmm_checkcorruption.c index 2600aa3271c..573f7da2d09 100644 --- a/mm/kmm_heap/kmm_checkcorruption.c +++ b/mm/kmm_heap/kmm_checkcorruption.c @@ -44,7 +44,7 @@ void kmm_checkcorruption(void) { - mm_checkcorruption(g_kmmheap); + mm_checkcorruption(KNR_HEAP); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_extend.c b/mm/kmm_heap/kmm_extend.c index 119e8c15b2e..f6afa025a88 100644 --- a/mm/kmm_heap/kmm_extend.c +++ b/mm/kmm_heap/kmm_extend.c @@ -45,7 +45,7 @@ void kmm_extend(FAR void *mem, size_t size, int region) { - mm_extend(g_kmmheap, mem, size, region); + mm_extend(KNR_HEAP, mem, size, region); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_free.c b/mm/kmm_heap/kmm_free.c index f0edc4115a2..275bc3fa1a8 100644 --- a/mm/kmm_heap/kmm_free.c +++ b/mm/kmm_heap/kmm_free.c @@ -55,7 +55,7 @@ void kmm_free(FAR void *mem) { DEBUGASSERT((mem == NULL) || kmm_heapmember(mem)); - mm_free(g_kmmheap, mem); + mm_free(KNR_HEAP, mem); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_heapmember.c b/mm/kmm_heap/kmm_heapmember.c index 2888a21af15..68b8c454101 100644 --- a/mm/kmm_heap/kmm_heapmember.c +++ b/mm/kmm_heap/kmm_heapmember.c @@ -54,7 +54,7 @@ bool kmm_heapmember(FAR void *mem) { - return mm_heapmember(g_kmmheap, mem); + return mm_heapmember(KNR_HEAP, mem); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_mallinfo.c b/mm/kmm_heap/kmm_mallinfo.c index a4cfc28a720..01ded04ba93 100644 --- a/mm/kmm_heap/kmm_mallinfo.c +++ b/mm/kmm_heap/kmm_mallinfo.c @@ -45,7 +45,7 @@ struct mallinfo kmm_mallinfo(void) { - return mm_mallinfo(g_kmmheap); + return mm_mallinfo(KNR_HEAP); } /**************************************************************************** @@ -59,6 +59,6 @@ struct mallinfo kmm_mallinfo(void) struct mallinfo_task kmm_mallinfo_task(FAR const struct malltask *task) { - return mm_mallinfo_task(g_kmmheap, task); + return mm_mallinfo_task(KNR_HEAP, task); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_malloc.c b/mm/kmm_heap/kmm_malloc.c index 46e176f2d23..a577ca58d88 100644 --- a/mm/kmm_heap/kmm_malloc.c +++ b/mm/kmm_heap/kmm_malloc.c @@ -50,7 +50,7 @@ FAR void *kmm_malloc(size_t size) { - return mm_malloc(g_kmmheap, size); + return mm_malloc(KNR_HEAP, size); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_malloc_size.c b/mm/kmm_heap/kmm_malloc_size.c index 0cf4148b6cb..36dc56b3617 100644 --- a/mm/kmm_heap/kmm_malloc_size.c +++ b/mm/kmm_heap/kmm_malloc_size.c @@ -36,7 +36,7 @@ size_t kmm_malloc_size(FAR void *mem) { - return mm_malloc_size(g_kmmheap, mem); + return mm_malloc_size(KNR_HEAP, mem); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_memalign.c b/mm/kmm_heap/kmm_memalign.c index b022ad95750..7a515af2fb1 100644 --- a/mm/kmm_heap/kmm_memalign.c +++ b/mm/kmm_heap/kmm_memalign.c @@ -53,7 +53,7 @@ FAR void *kmm_memalign(size_t alignment, size_t size) { - return mm_memalign(g_kmmheap, alignment, size); + return mm_memalign(KNR_HEAP, alignment, size); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_memdump.c b/mm/kmm_heap/kmm_memdump.c index 21354f2508f..1542a2207bf 100644 --- a/mm/kmm_heap/kmm_memdump.c +++ b/mm/kmm_heap/kmm_memdump.c @@ -43,7 +43,7 @@ void kmm_memdump(FAR const struct mm_memdump_s *dump) { - mm_memdump(g_kmmheap, dump); + mm_memdump(KNR_HEAP, dump); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_realloc.c b/mm/kmm_heap/kmm_realloc.c index 62561f1fc6d..b251700d116 100644 --- a/mm/kmm_heap/kmm_realloc.c +++ b/mm/kmm_heap/kmm_realloc.c @@ -51,7 +51,7 @@ FAR void *kmm_realloc(FAR void *oldmem, size_t newsize) { - return mm_realloc(g_kmmheap, oldmem, newsize); + return mm_realloc(KNR_HEAP, oldmem, newsize); } #endif /* CONFIG_MM_KERNEL_HEAP */ diff --git a/mm/kmm_heap/kmm_zalloc.c b/mm/kmm_heap/kmm_zalloc.c index 33522676254..b8af468576b 100644 --- a/mm/kmm_heap/kmm_zalloc.c +++ b/mm/kmm_heap/kmm_zalloc.c @@ -50,7 +50,7 @@ FAR void *kmm_zalloc(size_t size) { - return mm_zalloc(g_kmmheap, size); + return mm_zalloc(KNR_HEAP, size); } #endif /* CONFIG_MM_KERNEL_HEAP */
