diff --git a/include/nuttx/mm/mempool.h b/include/nuttx/mm/mempool.h index 1300beecf9..14fd11ff92 100644 --- a/include/nuttx/mm/mempool.h +++ b/include/nuttx/mm/mempool.h @@ -138,8 +138,6 @@ struct mempoolinfo_s unsigned long nwaiter; /* This is the number of waiter for mempool */ }; -#define mempoolinfo_task mallinfo_task - /**************************************************************************** * Public Function Prototypes ****************************************************************************/ @@ -268,7 +266,7 @@ int mempool_deinit(FAR struct mempool_s *pool); * Statistics of memory information based on dump. ****************************************************************************/ -struct mempoolinfo_task +struct mallinfo_task mempool_info_task(FAR struct mempool_s *pool, FAR const struct mm_memdump_s *dump); @@ -518,7 +516,7 @@ mempool_multiple_mallinfo(FAR struct mempool_multiple_s *mpool); * Statistics of memory information based on dump. ****************************************************************************/ -struct mempoolinfo_task +struct mallinfo_task mempool_multiple_info_task(FAR struct mempool_multiple_s *mpool, FAR const struct mm_memdump_s *dump); diff --git a/mm/mempool/mempool.c b/mm/mempool/mempool.c index 3b403cc479..76a00034f8 100644 --- a/mm/mempool/mempool.c +++ b/mm/mempool/mempool.c @@ -390,12 +390,12 @@ int mempool_info(FAR struct mempool_s *pool, FAR struct mempoolinfo_s *info) * Name: mempool_info_task ****************************************************************************/ -struct mempoolinfo_task +struct mallinfo_task mempool_info_task(FAR struct mempool_s *pool, FAR const struct mm_memdump_s *dump) { irqstate_t flags = spin_lock_irqsave(&pool->lock); - struct mempoolinfo_task info = + struct mallinfo_task info = { 0, 0 }; diff --git a/mm/mempool/mempool_multiple.c b/mm/mempool/mempool_multiple.c index 9139e06f81..038c00e9ac 100644 --- a/mm/mempool/mempool_multiple.c +++ b/mm/mempool/mempool_multiple.c @@ -766,13 +766,13 @@ mempool_multiple_mallinfo(FAR struct mempool_multiple_s *mpool) * Name: mempool_multiple_info_task ****************************************************************************/ -struct mempoolinfo_task +struct mallinfo_task mempool_multiple_info_task(FAR struct mempool_multiple_s *mpool, FAR const struct mm_memdump_s *dump) { int i; - struct mempoolinfo_task info; - struct mempoolinfo_task ret = + struct mallinfo_task info; + struct mallinfo_task ret = { 0, 0 };