diff options
author | Peng Tao <bergwolf@gmail.com> | 2013-06-03 13:58:22 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-03 18:32:51 (GMT) |
commit | 49c02a75708457b629bba47aed0ba28b2cabf4a1 (patch) | |
tree | d23494acfdb392db757adab317c5d8f818f43fe2 /drivers/staging/lustre/include | |
parent | c3dbb7812d21e04995c34c1a1a5e0e8262896d5f (diff) | |
download | linux-fsl-qoriq-49c02a75708457b629bba47aed0ba28b2cabf4a1.tar.xz |
staging/lustre: clean up and remove libcfs/linux/linux-mem.c
Those are simple wrappers for numa allocator. We don't need them.
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/include')
-rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/libcfs_private.h | 4 | ||||
-rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h | 19 |
2 files changed, 2 insertions, 21 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h index 62bf32f..c4f5907 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_private.h @@ -161,8 +161,8 @@ do { \ do { \ LIBCFS_ALLOC_PRE((size), (mask)); \ (ptr) = (size) <= LIBCFS_VMALLOC_SIZE ? \ - cfs_cpt_malloc((cptab), (cpt), (size), (mask)) : \ - cfs_cpt_vmalloc((cptab), (cpt), (size)); \ + kmalloc_node((size), (mask), cfs_cpt_spread_node(cptab, cpt)) :\ + vmalloc_node(size, cfs_cpt_spread_node(cptab, cpt)); \ LIBCFS_ALLOC_POST((ptr), (size)); \ } while (0) diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h index f6cb463..042a2bc 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h @@ -79,25 +79,6 @@ do { __oldfs = get_fs(); set_fs(get_ds());} while(0) #define MMSPACE_CLOSE set_fs(__oldfs) - -/* - * NUMA allocators - * - * NB: we will rename these functions in a separate patch: - * - rename kmalloc to cfs_malloc - * - rename kmalloc/free_page to cfs_page_alloc/free - * - rename kmalloc/free_large to cfs_vmalloc/vfree - */ -extern void *cfs_cpt_malloc(struct cfs_cpt_table *cptab, int cpt, - size_t nr_bytes, unsigned int flags); -extern void *cfs_cpt_vmalloc(struct cfs_cpt_table *cptab, int cpt, - size_t nr_bytes); -extern struct page *cfs_page_cpt_alloc(struct cfs_cpt_table *cptab, - int cpt, unsigned int flags); -extern void *cfs_mem_cache_cpt_alloc(struct kmem_cache *cachep, - struct cfs_cpt_table *cptab, - int cpt, unsigned int flags); - /* * Shrinker */ |