OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arm/allocateheap: fix multiple definition of 'up_allocate_heap' 

ld: arch/libarch.a(cxd56_allocateheap.c.obj): in function `up_allocate_heap':
arch/arm/src/cxd56xx/cxd56_allocateheap.c:113: multiple definition of `up_allocate_heap'; arch/libarch.a(arm_allocateheap.c.obj):
                                               arch/arm/src/common/arm_allocateheap.c:110: first defined here

Signed-off-by: chao.an <anchao@xiaomi.com>
This commit is contained in:
chao.an 2022-07-29 12:39:11 +08:00 committed by Petro Karashchenko
parent b232508bd9
commit 0d28168679
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/common/arm_allocateheap.c
View File

@ -105,7 +105,7 @@
#ifdef CONFIG_BUILD_KERNEL #ifdef CONFIG_BUILD_KERNEL
void up_allocate_kheap(void **heap_start, size_t *heap_size) void up_allocate_kheap(void **heap_start, size_t *heap_size)
#else #else
void up_allocate_heap(void **heap_start, size_t *heap_size) void weak_function up_allocate_heap(void **heap_start, size_t *heap_size)
#endif #endif
{ {
#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) #if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP)