michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mempool: move BUILD_ASSERT to the end of K_MEM_POOL_DEFINE

Browse source 
Move BUILD_ASSERT to the end of K_MEM_POOL_DEFINE.
K_MEM_POOL_DEFINE can not be processed if
combined with an other macro like __section.

Fixes: #17313

Signed-off-by: Johann Fischer <j.fischer@phytec.de>
This commit is contained in:
Johann Fischer 2019-07-04 15:55:20 +02:00 • committed by Andrew Boie
commit 223a2b950f
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/kernel.h
View file

@ -4157,7 +4157,6 @@ struct k_mem_pool {
* @req K-MPOOL-001
*/
#define K_MEM_POOL_DEFINE(name, minsz, maxsz, nmax, align) \
BUILD_ASSERT(WB_UP(maxsz) >= _MPOOL_MINBLK); \
char __aligned(WB_UP(align)) _mpool_buf_##name[WB_UP(maxsz) * nmax \
+ _MPOOL_BITS_SIZE(maxsz, minsz, nmax)]; \
struct sys_mem_pool_lvl _mpool_lvls_##name[Z_MPOOL_LVLS(maxsz, minsz)]; \
@ -4170,7 +4169,8 @@ struct k_mem_pool {
.levels = _mpool_lvls_##name, \
.flags = SYS_MEM_POOL_KERNEL \
} \
}
}; \
BUILD_ASSERT(WB_UP(maxsz) >= _MPOOL_MINBLK);
/**
* @brief Allocate memory from a memory pool.