Commit 90f2cbbc authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Pekka Enberg
Browse files

mm, slob: Use NUMA_NO_NODE instead of -1 



Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent 645df230

include/linux/slob_def.h

+4 −2
Original line number Diff line number Diff line 
#ifndef __LINUX_SLOB_DEF_H

#define __LINUX_SLOB_DEF_H



#include <linux/numa.h>



void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);



static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,

					      gfp_t flags)

{

	return kmem_cache_alloc_node(cachep, flags, -1);

	return kmem_cache_alloc_node(cachep, flags, NUMA_NO_NODE);

}



void *__kmalloc_node(size_t size, gfp_t flags, int node);
@@ -26,7 +28,7 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) 
 */

static __always_inline void *kmalloc(size_t size, gfp_t flags)

{

	return __kmalloc_node(size, flags, -1);

	return __kmalloc_node(size, flags, NUMA_NO_NODE);

}



static __always_inline void *__kmalloc(size_t size, gfp_t flags)

mm/slob.c

+3 −3
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node) 
	void *page;



#ifdef CONFIG_NUMA

	if (node != -1)

	if (node != NUMA_NO_NODE)

		page = alloc_pages_exact_node(node, gfp, order);

	else

#endif
@@ -290,7 +290,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node) 
		 * If there's a node specification, search for a partial

		 * page with a matching node id in the freelist.

		 */

		if (node != -1 && page_to_nid(sp) != node)

		if (node != NUMA_NO_NODE && page_to_nid(sp) != node)

			continue;

#endif

		/* Enough room on this page? */
@@ -514,7 +514,7 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size, 
	struct kmem_cache *c;



	c = slob_alloc(sizeof(struct kmem_cache),

		GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);

		GFP_KERNEL, ARCH_KMALLOC_MINALIGN, NUMA_NO_NODE);



	if (c) {

		c->name = name;