From b95e960d10bfaba7bf441c4c0dde1453ab6e3ce9 Mon Sep 17 00:00:00 2001 From: Andrew Boie Date: Mon, 28 Sep 2020 13:26:38 -0700 Subject: [PATCH] kernel: move k_heap definition Move it to where the rest of the k_heap APIs are defined. Signed-off-by: Andrew Boie --- include/kernel.h | 8 ++++++++ include/kernel_structs.h | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/kernel.h b/include/kernel.h index 0804ded8225..90440ba141c 100644 --- a/include/kernel.h +++ b/include/kernel.h @@ -4610,6 +4610,14 @@ static inline uint32_t k_mem_slab_num_free_get(struct k_mem_slab *slab) * @{ */ +/* kernel synchronized heap struct */ + +struct k_heap { + struct sys_heap heap; + _wait_q_t wait_q; + struct k_spinlock lock; +}; + /** * @brief Initialize a k_heap * diff --git a/include/kernel_structs.h b/include/kernel_structs.h index 775352c794a..7b7b748cd7e 100644 --- a/include/kernel_structs.h +++ b/include/kernel_structs.h @@ -229,14 +229,6 @@ struct _timeout { #endif }; -/* kernel synchronized heap struct */ - -struct k_heap { - struct sys_heap heap; - _wait_q_t wait_q; - struct k_spinlock lock; -}; - #endif /* _ASMLANGUAGE */ #endif /* ZEPHYR_KERNEL_INCLUDE_KERNEL_STRUCTS_H_ */