Commit f0dd891d authored by Yury Norov's avatar Yury Norov
Browse files

lib/cpumask: move some one-line wrappers to header file 



After moving gfp flags to a separate header, it's possible to move some
cpumask allocators into headers, and avoid creating real functions.

Signed-off-by: default avatarYury Norov <yury.norov@gmail.com>
parent 7343f2b0

include/linux/cpumask.h

+31 −3
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <linux/bitmap.h>

#include <linux/atomic.h>

#include <linux/bug.h>

#include <linux/gfp_types.h>

#include <linux/numa.h>



/* Don't assign or return these: may not be this big! */

typedef struct cpumask { DECLARE_BITMAP(bits, NR_CPUS); } cpumask_t;
@@ -794,9 +796,35 @@ typedef struct cpumask *cpumask_var_t; 
#define __cpumask_var_read_mostly	__read_mostly



bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node);

bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags);

bool zalloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node);

bool zalloc_cpumask_var(cpumask_var_t *mask, gfp_t flags);



static inline

bool zalloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)

{

	return alloc_cpumask_var_node(mask, flags | __GFP_ZERO, node);

}



/**

 * alloc_cpumask_var - allocate a struct cpumask

 * @mask: pointer to cpumask_var_t where the cpumask is returned

 * @flags: GFP_ flags

 *

 * Only defined when CONFIG_CPUMASK_OFFSTACK=y, otherwise is

 * a nop returning a constant 1 (in <linux/cpumask.h>).

 *

 * See alloc_cpumask_var_node.

 */

static inline

bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)

{

	return alloc_cpumask_var_node(mask, flags, NUMA_NO_NODE);

}



static inline

bool zalloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)

{

	return alloc_cpumask_var(mask, flags | __GFP_ZERO);

}



void alloc_bootmem_cpumask_var(cpumask_var_t *mask);

void free_cpumask_var(cpumask_var_t mask);

void free_bootmem_cpumask_var(cpumask_var_t mask);

lib/cpumask.c

+0 −28
Original line number Diff line number Diff line
@@ -70,34 +70,6 @@ bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node) 
}

EXPORT_SYMBOL(alloc_cpumask_var_node);



bool zalloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node)

{

	return alloc_cpumask_var_node(mask, flags | __GFP_ZERO, node);

}

EXPORT_SYMBOL(zalloc_cpumask_var_node);



/**

 * alloc_cpumask_var - allocate a struct cpumask

 * @mask: pointer to cpumask_var_t where the cpumask is returned

 * @flags: GFP_ flags

 *

 * Only defined when CONFIG_CPUMASK_OFFSTACK=y, otherwise is

 * a nop returning a constant 1 (in <linux/cpumask.h>).

 *

 * See alloc_cpumask_var_node.

 */

bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)

{

	return alloc_cpumask_var_node(mask, flags, NUMA_NO_NODE);

}

EXPORT_SYMBOL(alloc_cpumask_var);



bool zalloc_cpumask_var(cpumask_var_t *mask, gfp_t flags)

{

	return alloc_cpumask_var(mask, flags | __GFP_ZERO);

}

EXPORT_SYMBOL(zalloc_cpumask_var);



/**

 * alloc_bootmem_cpumask_var - allocate a struct cpumask from the bootmem arena.

 * @mask: pointer to cpumask_var_t where the cpumask is returned