diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-10-03 09:56:12 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-10-03 09:56:12 +0300 |
| commit | 023dc70470502f41b285112d4840f35d9075b767 (patch) | |
| tree | f2f06d54be9583d9b1b2abae4c76722c5453df83 /include/linux/slob_def.h | |
| parent | a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 (diff) | |
| parent | 608da7e3fc7259eca0d983b31bc8915af14cf15e (diff) | |
| download | op-kernel-dev-023dc70470502f41b285112d4840f35d9075b767.zip op-kernel-dev-023dc70470502f41b285112d4840f35d9075b767.tar.gz | |
Merge branch 'slab/next' into slab/for-linus
Diffstat (limited to 'include/linux/slob_def.h')
| -rw-r--r-- | include/linux/slob_def.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h index 0ec00b3..f28e14a 100644 --- a/include/linux/slob_def.h +++ b/include/linux/slob_def.h @@ -1,12 +1,14 @@ #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) |
