From 4d8c717c694edc6ccdc72e04d7546107e6d89a23 Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Mon, 20 Apr 2015 15:45:54 -0400 Subject: [PATCH] Remove _task_mem_pool_move() The routine _task_mem_pool_move() is only relevant to a multi-node system. Signed-off-by: Peter Mitsis Change-Id: I191e43f24aa56159a4c4669ff135beceade56284 --- include/microkernel/pool.h | 6 ------ kernel/microkernel/k_mempool.c | 21 --------------------- 2 files changed, 27 deletions(-) diff --git a/include/microkernel/pool.h b/include/microkernel/pool.h index 9adf7632000..a56455606d6 100644 --- a/include/microkernel/pool.h +++ b/include/microkernel/pool.h @@ -41,8 +41,6 @@ extern void InitPools(void); extern int _task_mem_pool_alloc(struct k_block *B, kmemory_pool_t pid, int size, int32_t time); -extern int _task_mem_pool_move(struct k_block *b, kmemory_pool_t pid, int32_t time); - extern void task_mem_pool_free(struct k_block *bl); extern void task_mem_pool_defragment(kmemory_pool_t pid); @@ -50,10 +48,6 @@ extern void task_mem_pool_defragment(kmemory_pool_t pid); #define task_mem_pool_alloc_wait(b, pid, s) _task_mem_pool_alloc(b, pid, s, TICKS_UNLIMITED) #define task_mem_pool_alloc_wait_timeout(b, pid, s, t) _task_mem_pool_alloc(b, pid, s, t) -#define task_mem_pool_move(b, p) _task_mem_pool_move(b, p, TICKS_NONE) -#define task_mem_pool_move_wait(b, p) _task_mem_pool_move(b, p, TICKS_UNLIMITED) -#define task_mem_pool_move_wait_timeout(b, p, t) _task_mem_pool_move(b, p, t) - #ifdef __cplusplus } #endif diff --git a/kernel/microkernel/k_mempool.c b/kernel/microkernel/k_mempool.c index ffbbaf2a5aa..eca9844340d 100644 --- a/kernel/microkernel/k_mempool.c +++ b/kernel/microkernel/k_mempool.c @@ -685,24 +685,3 @@ void task_mem_pool_free(struct k_block *blockptr /* pointer to block to free */ A.Args.p1.rep_dataptr = blockptr->pointer_to_data; KERNEL_ENTRY(&A); } - -/******************************************************************************* -* -* _task_mem_pool_move - move memory pool block to local memory pool request -* -* This routine ensures the contents of the specified memory pool block -* are held locally. If the specified block belongs to a remote memory pool -* the block's data is copied to a newly allocated local block and the remote -* block is released. (If the specified block is already local it is left as is.) -* -* RETURNS: N/A -*/ - -int _task_mem_pool_move(struct k_block *block, kmemory_pool_t localpoolid, int32_t time) -{ - ARG_UNUSED(block); - ARG_UNUSED(localpoolid); - ARG_UNUSED(time); - - return RC_OK; -}